diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-05-09 17:45:38 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 17:10:56 +0100 |
| commit | 7a017f91981907c37e2de11ef9fc86b747961222 (patch) | |
| tree | e5cc8be386b624b7035c8e9821c43612147b7762 | |
| parent | b4a5bed917569975f2d702d3db55dd8e6c92e5fa (diff) | |
| download | openembedded-core-contrib-7a017f91981907c37e2de11ef9fc86b747961222.tar.gz | |
libzypp: fix compilatoin with gcc 4.6.0
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 3 |
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 @@ +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) 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" S = "${WORKDIR}/git" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" PV = "0.0-git${SRCPV}" -PR = "r9" +PR = "r10" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ @@ -22,6 +22,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://rpm5-no-rpmdbinit.patch \ file://config-release.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" |