libzypp: fix compilatoin with gcc 4.6.0
(From OE-Core rev: 7a017f91981907c37e2de11ef9fc86b747961222) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9582e90a87
commit
cba146c706
|
@ -0,0 +1,22 @@
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Fix following compilation errors with gcc 4.6.0
|
||||||
|
Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/09
|
||||||
|
|
||||||
|
| i586-poky-linux-g++: error: unrecognized option '--as-needed'
|
||||||
|
| make[2]: *** [zypp/libzypp.so.810.1.0] Error 1
|
||||||
|
|
||||||
|
|
||||||
|
Index: git/zypp/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/zypp/CMakeLists.txt
|
||||||
|
+++ git/zypp/CMakeLists.txt
|
||||||
|
@@ -903,7 +903,7 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRC
|
||||||
|
ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
|
||||||
|
SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
|
||||||
|
SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
|
||||||
|
-SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
|
||||||
|
+SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "-Wl,--as-needed" )
|
||||||
|
ADD_DEPENDENCIES(zypp schema_header)
|
||||||
|
# System libraries
|
||||||
|
SET(UTIL_LIBRARY util)
|
|
@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
|
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
|
||||||
PV = "0.0-git${SRCPV}"
|
PV = "0.0-git${SRCPV}"
|
||||||
PR = "r9"
|
PR = "r10"
|
||||||
|
|
||||||
SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
|
SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
|
||||||
file://no-doc.patch \
|
file://no-doc.patch \
|
||||||
|
@ -22,6 +22,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
|
||||||
file://rpm5-no-rpmdbinit.patch \
|
file://rpm5-no-rpmdbinit.patch \
|
||||||
file://config-release.patch \
|
file://config-release.patch \
|
||||||
file://libzypp-pokyarch.patch \
|
file://libzypp-pokyarch.patch \
|
||||||
|
file://fix_for_compile_wth_gcc-4.6.0.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
|
SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
|
||||||
|
|
Loading…
Reference in New Issue