diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-01-21 09:49:22 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-24 14:09:12 -0800 |
commit | 6281264ebe03f2dadb4064c1b0f648781ee5e009 (patch) | |
tree | 25fe6c6e8a2ea7e80b4e4f98042d21c3d7edb249 /meta/recipes-extended/libzypp/libzypp_git.bb | |
parent | 1ef70572f9480d14e945aae5197d24d1ce1bdf9c (diff) | |
download | poky-6281264ebe03f2dadb4064c1b0f648781ee5e009.tar.gz |
libzypp: revert the dso_linking_change patch as the new linker fixes it
The newer binutils recipe of version 2.21 has a fix for ld which avoids an
issue where weak symbols like pthread_cancel were causing linking to fail when
--no-add-as-needed parameter was passed to ld.
See more information here: http://bugs.debian.org/591405
This makes some of the fixes for breakage after gcc dso linking change
unnecessary and this is one of them.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 7036c6471b..c65ae46b05 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
@@ -13,12 +13,11 @@ RDEPENDS_${PN} = "sat-solver" | |||
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | PV = "0.0-git${SRCPV}" | 15 | PV = "0.0-git${SRCPV}" |
16 | PR = "r5" | 16 | PR = "r6" |
17 | 17 | ||
18 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ | 18 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ |
19 | file://no-doc.patch \ | 19 | file://no-doc.patch \ |
20 | file://rpm5.patch \ | 20 | file://rpm5.patch " |
21 | file://dso_linking_change_build_fix.patch" | ||
22 | 21 | ||
23 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | 22 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" |
24 | 23 | ||