aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2019-10-08 11:49:02 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2019-10-08 11:49:08 +0200
commitcc703a23984b28ddfb0eafdf01b7240b2416bc2d (patch)
tree8b3e53478bb6bb063348344bb293405b0330a279
parent9f8cd0ac892ba78a744e1a34e653e37f4f8f0b85 (diff)
parent30fc1a3f5470cb347eb4aed281242f120510466f (diff)
downloadbitcoin-cc703a23984b28ddfb0eafdf01b7240b2416bc2d.tar.xz
Merge #17066: build: Remove workaround for ancient libtool
30fc1a3f5470cb347eb4aed281242f120510466f build: Remove workaround for ancient libtool (Hennadii Stepanov) 6ca01b9a104ebadbe7e180cb2b9d390f7c09b4ab build: Ensure a minimal version of libtool (Hennadii Stepanov) Pull request description: Since libtool 1.5.2, on Linux libtool no longer sets RPATH for any directories in the dynamic linker search path, so there is no longer an issue. This commit reverts a98356fee8a44d7d1cb37f22c876fff8f244365e. Refs: - https://wiki.debian.org/RpathIssue - [Debian jessie has libtool 2.4.2](https://packages.debian.org/jessie/libtool) ACKs for top commit: laanwj: ACK 30fc1a3f5470cb347eb4aed281242f120510466f Tree-SHA512: fab56265d4d2c96216a353cc076c6f510e15748d8134f97bae2f67b6d8c0b6a1a9f362d2ab23b19ccc3a8bba8eac3bb1668fc3e42037590f63a7ab4819c9ee15
-rw-r--r--configure.ac15
1 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 8af9a986d2..d25e0f4496 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ fi
AC_PROG_OBJCXX
])
+dnl Since libtool 1.5.2 (released 2004-01-25), on Linux libtool no longer
+dnl sets RPATH for any directories in the dynamic linker search path.
+dnl See more: https://wiki.debian.org/RpathIssue
+LT_PREREQ([1.5.2])
dnl Libtool init checks.
LT_INIT([pic-only])
@@ -1660,17 +1664,6 @@ AC_CONFIG_SUBDIRS([src/secp256k1])
AC_OUTPUT
-dnl Taken from https://wiki.debian.org/RpathIssue
-case $host in
- *-*-linux-gnu)
- AC_MSG_RESULT([Fixing libtool for -rpath problems.])
- sed < libtool > libtool-2 \
- 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
- mv libtool-2 libtool
- chmod 755 libtool
- ;;
-esac
-
dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows
case ${OS} in
*Windows*)