diff mbox series

[05/18] elfutils: remove 0001-dso-link-change.patch

Message ID 20250407094045.753021-5-alex.kanavin@gmail.com
State New
Headers show
Series [01/18] nfs-utils: replace problematic pending patch with upstream submission | expand

Commit Message

Alexander Kanavin April 7, 2025, 9:40 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

The original linking issues seem to be long gone.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../elfutils/elfutils_0.192.bb                |  1 -
 .../elfutils/files/0001-dso-link-change.patch | 49 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb
index 4fbfa4b1357..f96e7c8ef05 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"
 # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz
 SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://run-ptest \
-           file://0001-dso-link-change.patch \
            file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
            file://0003-fixheadercheck.patch \
            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 0eb532f3dd5..00000000000
--- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
+++ /dev/null
@@ -1,49 +0,0 @@ 
-From 7b0f78c86bf2e658649327fb3dd1b862f282c42e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 15 Aug 2017 17:10:57 +0800
-Subject: [PATCH] dso link change
-
-Upstream-Status: Pending
-
-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.
-
-Rebase to 0.170
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- src/Makefile.am   | 2 +-
- tests/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6bdf2df..3bcee3c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -56,7 +56,7 @@ libdebuginfod =
- endif
- else
- libasm = ../libasm/libasm.so
--libdw = ../libdw/libdw.so
-+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
- libelf = ../libelf/libelf.so
- if LIBDEBUGINFOD
- libdebuginfod = ../debuginfod/libdebuginfod.so
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 76f1682..865a604 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -733,7 +733,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
- libelf = ../libelf/libelf.a -lz $(zstd_LIBS) $(libeu)
- libasm = ../libasm/libasm.a
- else
--libdw = ../libdw/libdw.so
-+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
- libelf = ../libelf/libelf.so
- libasm = ../libasm/libasm.so
- endif