]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
opcodes: link against libbfd.la for rpath deps users/gentoo/2.27
authorMike Frysinger <vapier@gentoo.org>
Tue, 5 Jul 2016 14:39:00 +0000 (20:24 +0545)
committerMike Frysinger <vapier@gentoo.org>
Sat, 12 Nov 2016 07:33:37 +0000 (02:33 -0500)
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

opcodes/configure
opcodes/configure.ac

index 5a4da0667464688b146904e2785dfd4e8fc92468..256d38aca29e17a83cef4c7113b7330cd8cc5756 100755 (executable)
@@ -12517,7 +12517,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"
index c7f47837186bdcfa9a699f93c3f5c4495c09c502..6e3b05f0d26a18023e4838ba9c90be4fb69027b4 100644 (file)
@@ -185,7 +185,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"