diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-01-19 16:41:01 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:37:05 +0000 |
| commit | 546ef7bb6d7ef95005633e15db276d70033066c8 (patch) | |
| tree | 89774bef71e68135c26d3671fb9df78b44d187ae /meta/recipes-devtools/apt | |
| parent | 746173daad9fbd46dc7917b1423855d1997782c1 (diff) | |
| download | openembedded-core-546ef7bb6d7ef95005633e15db276d70033066c8.tar.gz openembedded-core-546ef7bb6d7ef95005633e15db276d70033066c8.tar.bz2 openembedded-core-546ef7bb6d7ef95005633e15db276d70033066c8.zip | |
apt: 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-devtools/apt')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt_0.7.14.bb | 5 |
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch b/meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..b69849f946 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch @@ -0,0 +1,25 @@ +after gcc linking has changed, all the libraries must be explicitely specified +This patch avoids these linking errors: + +Building program /build_disk/poky_build/build0/tmp/work/i586-poky-linux/apt-0.7.14-r4/apt-0.7.14/bin/methods/https +/build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: <86>: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition +/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value +collect2: ld returned 1 exit status +make[2]: *** [/build_disk/poky_build/build0/tmp/work/i586-poky-linux/apt-0.7.14-r4/apt-0.7.14/bin/methods/https] Error 1 + +Nitin A Kamble <nitin.a.kamble@intel.com> +Date: 2011/01/19 + +Index: apt-0.7.14/methods/makefile +=================================================================== +--- apt-0.7.14.orig/methods/makefile 2008-05-28 06:22:14.000000000 -0700 ++++ apt-0.7.14/methods/makefile 2011-01-19 16:30:07.369010214 -0800 +@@ -54,7 +54,7 @@ + + # The https method + PROGRAM=https +-SLIBS = -lapt-pkg -lcurl ++SLIBS = -lapt-pkg -lcurl -lpthread + LIB_MAKES = apt-pkg/makefile + SOURCE = https.cc + include $(PROGRAM_H) diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb index d2bcde5a22..b9b278b17c 100644 --- a/meta/recipes-devtools/apt/apt_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb @@ -3,10 +3,11 @@ RDEPENDS_${PN} = "dpkg" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc -PR = "r4" +PR = "r5" SRC_URI += "file://nodoc.patch \ - file://includes-fix.patch" + file://includes-fix.patch \ + file://dso_linking_change_build_fix.patch " SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814" SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045" |