diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-01-21 09:52:23 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-24 14:09:12 -0800 |
| commit | ff02b364282befc1f8606b0bbf7fa659e7765ca5 (patch) | |
| tree | 6d75f659e22c41af3c2c0f97183bd9b62c52fdf9 /meta/recipes-devtools/apt/apt-0.7.14 | |
| parent | 6281264ebe03f2dadb4064c1b0f648781ee5e009 (diff) | |
| download | poky-ff02b364282befc1f8606b0bbf7fa659e7765ca5.tar.gz | |
apt: 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 wh
--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-devtools/apt/apt-0.7.14')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch | 25 |
1 files changed, 0 insertions, 25 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 deleted file mode 100644 index b69849f946..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/dso_linking_change_build_fix.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | after gcc linking has changed, all the libraries must be explicitely specified | ||
| 2 | This patch avoids these linking errors: | ||
| 3 | |||
| 4 | Building program /build_disk/poky_build/build0/tmp/work/i586-poky-linux/apt-0.7.14-r4/apt-0.7.14/bin/methods/https | ||
| 5 | /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 | ||
| 6 | /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value | ||
| 7 | collect2: ld returned 1 exit status | ||
| 8 | 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 | ||
| 9 | |||
| 10 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 11 | Date: 2011/01/19 | ||
| 12 | |||
| 13 | Index: apt-0.7.14/methods/makefile | ||
| 14 | =================================================================== | ||
| 15 | --- apt-0.7.14.orig/methods/makefile 2008-05-28 06:22:14.000000000 -0700 | ||
| 16 | +++ apt-0.7.14/methods/makefile 2011-01-19 16:30:07.369010214 -0800 | ||
| 17 | @@ -54,7 +54,7 @@ | ||
| 18 | |||
| 19 | # The https method | ||
| 20 | PROGRAM=https | ||
| 21 | -SLIBS = -lapt-pkg -lcurl | ||
| 22 | +SLIBS = -lapt-pkg -lcurl -lpthread | ||
| 23 | LIB_MAKES = apt-pkg/makefile | ||
| 24 | SOURCE = https.cc | ||
| 25 | include $(PROGRAM_H) | ||