summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2011-12-29 16:14:39 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:39 +0000
commit3b798c8a711d4c348dd25041dc60052928f746b3 (patch)
tree93f359c4f67b23aae92e57c2a7e14c794acd8b96
parentfa03a6d17d63db0e69e12c6451075ceab723bbf7 (diff)
downloadpoky-3b798c8a711d4c348dd25041dc60052928f746b3.tar.gz
elfutils: fix for dso link change in recent ld
This patch makes the link to the dependencies of libdw explicit, as recent ld no longer implicitly links them. See http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html as a similar example of the error message you can encounter without this patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for more details. (From OE-Core rev: 5d776e20b99db7eae307ca794ad58ac402c9eadf) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch32
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.148.bb5
2 files changed, 35 insertions, 2 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch b/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
new file mode 100644
index 0000000000..d0cd3ed6f9
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
@@ -0,0 +1,32 @@
1Upstream-Status: Pending
2
3# This patch makes the link to the dependencies of libdw explicit, as recent
4# ld no longer implicitly links them. See
5# http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html as
6# a similar example of the error message you can encounter without this patch,
7# and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and
8# https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for more
9# details.
10
11--- elfutils-0.148.orig/src/Makefile.am
12+++ elfutils-0.148/src/Makefile.am
13@@ -86,7 +86,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l
14 libelf = ../libelf/libelf.a
15 else
16 libasm = ../libasm/libasm.so
17-libdw = ../libdw/libdw.so
18+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
19 libelf = ../libelf/libelf.so
20 endif
21 libebl = ../libebl/libebl.a
22--- elfutils-0.148.orig/tests/Makefile.am
23+++ elfutils-0.148/tests/Makefile.am
24@@ -172,7 +172,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l
25 libelf = ../libelf/libelf.a
26 libasm = ../libasm/libasm.a
27 else
28-libdw = ../libdw/libdw.so
29+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
30 libelf = ../libelf/libelf.so
31 libasm = ../libasm/libasm.so
32 endif
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 0f4e8ca62e..710959a4c3 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
6 file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417" 6 file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
7DEPENDS = "libtool bzip2 zlib" 7DEPENDS = "libtool bzip2 zlib"
8 8
9PR = "r4" 9PR = "r5"
10 10
11SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" 11SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
12 12
@@ -29,7 +29,8 @@ SRC_URI += "\
29 file://elfutils-fsize.patch \ 29 file://elfutils-fsize.patch \
30 file://remove-unused.patch \ 30 file://remove-unused.patch \
31 file://mempcpy.patch \ 31 file://mempcpy.patch \
32 file://fix_for_gcc-4.7.patch\ 32 file://fix_for_gcc-4.7.patch \
33 file://dso-link-change.patch \
33" 34"
34# Only apply when building uclibc based target recipe 35# Only apply when building uclibc based target recipe
35SRC_URI_append_libc-uclibc = " ${@['', 'file://uclibc-support.patch']['${PN}' == '${BPN}']}" 36SRC_URI_append_libc-uclibc = " ${@['', 'file://uclibc-support.patch']['${PN}' == '${BPN}']}"