summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-21 09:49:22 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-24 14:09:12 -0800
commit6281264ebe03f2dadb4064c1b0f648781ee5e009 (patch)
tree25fe6c6e8a2ea7e80b4e4f98042d21c3d7edb249
parent1ef70572f9480d14e945aae5197d24d1ce1bdf9c (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-extended/libzypp/libzypp/dso_linking_change_build_fix.patch50
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb5
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/dso_linking_change_build_fix.patch b/meta/recipes-extended/libzypp/libzypp/dso_linking_change_build_fix.patch
deleted file mode 100644
index 496a3cabf6..0000000000
--- a/meta/recipes-extended/libzypp/libzypp/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4
5Linking CXX executable DumpSelectable
6cd /build_disk/poky_build/build0/tmp/work/i586-poky-linux/libzypp-0.0-git0+4494797d5b0369365b1af63921de45b197ead64f-r4/git/tools && /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/DumpSelectable.dir/link.txt --verbose=1
7/build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux -fpermissive -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed CMakeFiles/DumpSelectable.dir/DumpSelectable.cc.o -o DumpSelectable -rdynamic ../zypp/libzypp.so.800.1.1 -lboost_program_options-mt -lutil -lrpm -lcurl -lxml2 -lz -Wl,-Bstatic -lsatsolver -lsatsolverext -Wl,-Bdynamic -lexpat -lssl -lcrypto -lboost_signals-mt -ludev -Wl,-rpath,/build_disk/poky_build/build0/tmp/work/i586-poky-linux/libzypp-0.0-git0+4494797d5b0369365b1af63921de45b197ead64f-r4/git/zypp
8/build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: Ý: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition
9/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
10collect2: ld returned 1 exit status
11make[2]: *** [tools/DumpSelectable] Error 1
12
13
14
15| Linking CXX executable COW_debug
16| cd /build_disk/poky_build/build0/tmp/work/i586-poky-linux/libzypp-0.0-git0+4494797d5b0369365b1af63921de45b197ead64f-r5/git/examples && /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/COW_debug.dir/link.txt --verbose=1
17| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux -fpermissive -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed CMakeFiles/COW_debug.dir/COW_debug.cc.o -o COW_debug -rdynamic ../zypp/libzypp.so.800.1.1 -lutil -lrpm -lcurl -lxml2 -lz -Wl,-Bstatic -lsatsolver -lsatsolverext -Wl,-Bdynamic -lexpat -lssl -lcrypto -lboost_signals-mt -ludev -Wl,-rpath,/build_disk/poky_build/build0/tmp/work/i586-poky-linux/libzypp-0.0-git0+4494797d5b0369365b1af63921de45b197ead64f-r5/git/zypp
18| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: �: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition
19| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
20| collect2: ld returned 1 exit status
21| make[2]: *** [examples/COW_debug] Error 1
22
23
24Nitin A Kamble <nitin.a.kamble@intel.com>
25Date: 2011/01/18
26
27Index: git/tools/CMakeLists.txt
28===================================================================
29--- git.orig/tools/CMakeLists.txt 2010-12-19 23:59:02.000000000 -0800
30+++ git/tools/CMakeLists.txt 2011-01-18 17:07:52.132140223 -0800
31@@ -13,6 +13,7 @@
32 )
33 TARGET_LINK_LIBRARIES( ${loop_var}
34 zypp
35+ pthread
36 boost_program_options-mt
37 )
38 ENDFOREACH( loop_var )
39Index: git/examples/CMakeLists.txt
40===================================================================
41--- git.orig/examples/CMakeLists.txt 2010-12-19 23:59:01.000000000 -0800
42+++ git/examples/CMakeLists.txt 2011-01-18 17:17:41.760411373 -0800
43@@ -8,6 +8,7 @@
44 )
45 TARGET_LINK_LIBRARIES( ${loop_var}
46 zypp
47+ pthread
48 )
49 ENDFOREACH( loop_var )
50
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
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15PV = "0.0-git${SRCPV}" 15PV = "0.0-git${SRCPV}"
16PR = "r5" 16PR = "r6"
17 17
18SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 18SRC_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
23SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 22SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
24 23