summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-18 17:21:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:04 +0000
commitcff67292a2ce9a7866bf14653b5a81d501bfb64b (patch)
tree64b18ec66231a726406f7a7454dba7d3faf97dc1 /meta/recipes-extended
parenta849ef5f24f1dc1eecb699ecb5b39f6ca898d8ab (diff)
downloadpoky-cff67292a2ce9a7866bf14653b5a81d501bfb64b.tar.gz
libzypp: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso linking change patch. This was causing build errors for this recipe. Specifying the libpthread library explicitely for linking to work without errors. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-extended')
-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, 53 insertions, 2 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
new file mode 100644
index 0000000000..496a3cabf6
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/dso_linking_change_build_fix.patch
@@ -0,0 +1,50 @@
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 6918263296..7036c6471b 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -13,11 +13,12 @@ RDEPENDS_${PN} = "sat-solver"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15PV = "0.0-git${SRCPV}" 15PV = "0.0-git${SRCPV}"
16PR = "r4" 16PR = "r5"
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"
21 22
22SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 23SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
23 24