aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-07-05 20:24:00 +0545
committerAndreas K. Hüttel <dilfridge@gentoo.org>2019-10-13 05:48:07 +0200
commitcbf0d677fe09dca2396a05d7de2659804f4f5cfc (patch)
tree601a7258dbb5ddd02b0da8790412479abae32949
parentGentoo: libiberty: install PIC version of libiberty.a (diff)
downloadbinutils-gdb-cbf0d677fe09dca2396a05d7de2659804f4f5cfc.tar.gz
binutils-gdb-cbf0d677fe09dca2396a05d7de2659804f4f5cfc.tar.bz2
binutils-gdb-cbf0d677fe09dca2396a05d7de2659804f4f5cfc.zip
Gentoo: opcodes: link against libbfd.la for rpath deps
The reason opcodes doesn't link against libbfd.la is to workaround a libtool bug where it uses installed -L paths ahead of DESTDIR paths. The downside is that the library itself lacks rpath tags to find the right version of libbfd.so. Since Gentoo has patched the libtool bug for a while, we don't need the workaround. Use the .la file so we get the rpath tags. URL: https://bugs.gentoo.org/563934 (cherry picked from commit 662586237b0b00ee881e79b56f6234ff36e8bfe6) (cherry picked from commit 4c21c70c187a55cd8ce0992cda3687655d6d8df9)
-rwxr-xr-xopcodes/configure2
-rw-r--r--opcodes/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/opcodes/configure b/opcodes/configure
index 7ad135041d..f84ca51b8b 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -12797,7 +12797,7 @@ if test "$enable_shared" = "yes"; then
SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}"
;;
*)
- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}"
+ SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}"
;;
esac
SHARED_DEPENDENCIES="../bfd/libbfd.la"
diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index 500c701a62..9434ab7ef8 100644
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -188,7 +188,7 @@ changequote([,])dnl
SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}"
;;
*)
- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}"
+ SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}"
;;
esac
SHARED_DEPENDENCIES="../bfd/libbfd.la"