summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-09 17:45:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 17:14:26 +0100
commitcba146c706d886ef01a9551a53f6922ec3197966 (patch)
treeb0c7300cefdc74f6f20ae61846bd866409d781b7 /meta
parent9582e90a8709964f15d219f15a5cda1df1156de0 (diff)
downloadpoky-cba146c706d886ef01a9551a53f6922ec3197966.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch22
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb3
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch b/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
new file mode 100644
index 0000000000..0f17b489b2
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Pending
2
3Fix following compilation errors with gcc 4.6.0
4Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/09
5
6| i586-poky-linux-g++: error: unrecognized option '--as-needed'
7| make[2]: *** [zypp/libzypp.so.810.1.0] Error 1
8
9
10Index: git/zypp/CMakeLists.txt
11===================================================================
12--- git.orig/zypp/CMakeLists.txt
13+++ git/zypp/CMakeLists.txt
14@@ -903,7 +903,7 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRC
15 ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
16 SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
17 SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
18-SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
19+SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "-Wl,--as-needed" )
20 ADD_DEPENDENCIES(zypp schema_header)
21 # System libraries
22 SET(UTIL_LIBRARY util)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index f8535af679..824f7a1339 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
16PV = "0.0-git${SRCPV}" 16PV = "0.0-git${SRCPV}"
17PR = "r9" 17PR = "r10"
18 18
19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
20 file://no-doc.patch \ 20 file://no-doc.patch \
@@ -22,6 +22,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
22 file://rpm5-no-rpmdbinit.patch \ 22 file://rpm5-no-rpmdbinit.patch \
23 file://config-release.patch \ 23 file://config-release.patch \
24 file://libzypp-pokyarch.patch \ 24 file://libzypp-pokyarch.patch \
25 file://fix_for_compile_wth_gcc-4.6.0.patch \
25 " 26 "
26 27
27SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 28SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"