diff options
Diffstat (limited to '9999/0005-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch')
| -rw-r--r-- | 9999/0005-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/9999/0005-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch b/9999/0005-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch new file mode 100644 index 0000000..6eebb98 --- /dev/null +++ b/9999/0005-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch @@ -0,0 +1,84 @@ +From bbaa9fafb08385e5ad836bc30a2db3af47d1cc5a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Wed, 22 Feb 2023 20:05:35 +0100 +Subject: [PATCH 7/7] Apply a similar libiberty fix as in 7d53105d for + libopcodes and libgprofng +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29042 +Bug: https://bugs.gentoo.org/834720 +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + gprofng/src/Makefile.am | 3 ++- + gprofng/src/Makefile.in | 3 ++- + opcodes/configure | 4 ++-- + opcodes/configure.ac | 4 ++-- + 4 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am +index fb4b8a0fafa..3d7cb18ff71 100644 +--- a/gprofng/src/Makefile.am ++++ b/gprofng/src/Makefile.am +@@ -144,7 +144,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 + # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty + # when -nostdlib is passed to libtool. + # See bug 29364 - libgprofng.so: needs to link against -pthread +-libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ ++libgprofng_la_LIBADD = $(GPROFNG_LIBADD) \ ++ $(top_builddir)/../opcodes/libopcodes.la \ + $(top_builddir)/../bfd/libbfd.la \ + $(GPROFNG_LIBADD) \ + -lpthread -ldl +diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in +index cef4b275305..295fd3ee2df 100644 +--- a/gprofng/src/Makefile.in ++++ b/gprofng/src/Makefile.in +@@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 + # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty + # when -nostdlib is passed to libtool. + # See bug 29364 - libgprofng.so: needs to link against -pthread +-libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ ++libgprofng_la_LIBADD = $(GPROFNG_LIBADD) \ ++ $(top_builddir)/../opcodes/libopcodes.la \ + $(top_builddir)/../bfd/libbfd.la \ + $(GPROFNG_LIBADD) \ + -lpthread -ldl +diff --git a/opcodes/configure b/opcodes/configure +index 050fd5ff0ff..4b68211dea6 100755 +--- a/opcodes/configure ++++ b/opcodes/configure +@@ -14379,10 +14379,10 @@ if test "$enable_shared" = "yes"; then + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" ++ SHARED_LIBADD="$SHARED_LIBADD -L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" + ;; + *) +- SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" ++ SHARED_LIBADD="${SHARED_LIBADD} ../bfd/libbfd.la ${SHARED_LIBADD}" + SHARED_DEPENDENCIES="../bfd/libbfd.la" + ;; + esac +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 4d918e3ef9b..9692e69693e 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -195,10 +195,10 @@ if test "$enable_shared" = "yes"; then + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" ++ SHARED_LIBADD="$SHARED_LIBADD -L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" + ;; + *) +- SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" ++ SHARED_LIBADD="${SHARED_LIBADD} ../bfd/libbfd.la ${SHARED_LIBADD}" + SHARED_DEPENDENCIES="../bfd/libbfd.la" + ;; + esac +-- +2.44.2 + |