diff options
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.192.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb index 4fbfa4b135..f96e7c8ef0 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.192.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.192.bb | |||
| @@ -12,7 +12,6 @@ DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" | |||
| 12 | # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz | 12 | # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz |
| 13 | SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | 13 | SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ |
| 14 | file://run-ptest \ | 14 | file://run-ptest \ |
| 15 | file://0001-dso-link-change.patch \ | ||
| 16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ | 15 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ |
| 17 | file://0003-fixheadercheck.patch \ | 16 | file://0003-fixheadercheck.patch \ |
| 18 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ | 17 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ |
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch deleted file mode 100644 index 0eb532f3dd..0000000000 --- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From 7b0f78c86bf2e658649327fb3dd1b862f282c42e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 15 Aug 2017 17:10:57 +0800 | ||
| 4 | Subject: [PATCH] dso link change | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | This patch makes the link to the dependencies of libdw explicit, as | ||
| 9 | recent ld no longer implicitly links them. See | ||
| 10 | http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html | ||
| 11 | as a similar example of the error message you can encounter without this | ||
| 12 | patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and | ||
| 13 | https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for | ||
| 14 | more details. | ||
| 15 | |||
| 16 | Rebase to 0.170 | ||
| 17 | |||
| 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 19 | --- | ||
| 20 | src/Makefile.am | 2 +- | ||
| 21 | tests/Makefile.am | 2 +- | ||
| 22 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 25 | index 6bdf2df..3bcee3c 100644 | ||
| 26 | --- a/src/Makefile.am | ||
| 27 | +++ b/src/Makefile.am | ||
| 28 | @@ -56,7 +56,7 @@ libdebuginfod = | ||
| 29 | endif | ||
| 30 | else | ||
| 31 | libasm = ../libasm/libasm.so | ||
| 32 | -libdw = ../libdw/libdw.so | ||
| 33 | +libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl | ||
| 34 | libelf = ../libelf/libelf.so | ||
| 35 | if LIBDEBUGINFOD | ||
| 36 | libdebuginfod = ../debuginfod/libdebuginfod.so | ||
| 37 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
| 38 | index 76f1682..865a604 100644 | ||
| 39 | --- a/tests/Makefile.am | ||
| 40 | +++ b/tests/Makefile.am | ||
| 41 | @@ -733,7 +733,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread | ||
| 42 | libelf = ../libelf/libelf.a -lz $(zstd_LIBS) $(libeu) | ||
| 43 | libasm = ../libasm/libasm.a | ||
| 44 | else | ||
| 45 | -libdw = ../libdw/libdw.so | ||
| 46 | +libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl | ||
| 47 | libelf = ../libelf/libelf.so | ||
| 48 | libasm = ../libasm/libasm.so | ||
| 49 | endif | ||
