Skip to content

Commit cc703a2

Browse files
committed
Merge bitcoin#17066: build: Remove workaround for ancient libtool
30fc1a3 build: Remove workaround for ancient libtool (Hennadii Stepanov) 6ca01b9 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 a98356f. 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 30fc1a3 Tree-SHA512: fab56265d4d2c96216a353cc076c6f510e15748d8134f97bae2f67b6d8c0b6a1a9f362d2ab23b19ccc3a8bba8eac3bb1668fc3e42037590f63a7ab4819c9ee15
2 parents 9f8cd0a + 30fc1a3 commit cc703a2

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

configure.ac

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ fi
7676
AC_PROG_OBJCXX
7777
])
7878

79+
dnl Since libtool 1.5.2 (released 2004-01-25), on Linux libtool no longer
80+
dnl sets RPATH for any directories in the dynamic linker search path.
81+
dnl See more: https://wiki.debian.org/RpathIssue
82+
LT_PREREQ([1.5.2])
7983
dnl Libtool init checks.
8084
LT_INIT([pic-only])
8185

@@ -1660,17 +1664,6 @@ AC_CONFIG_SUBDIRS([src/secp256k1])
16601664

16611665
AC_OUTPUT
16621666

1663-
dnl Taken from https://wiki.debian.org/RpathIssue
1664-
case $host in
1665-
*-*-linux-gnu)
1666-
AC_MSG_RESULT([Fixing libtool for -rpath problems.])
1667-
sed < libtool > libtool-2 \
1668-
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
1669-
mv libtool-2 libtool
1670-
chmod 755 libtool
1671-
;;
1672-
esac
1673-
16741667
dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows
16751668
case ${OS} in
16761669
*Windows*)

0 commit comments

Comments
 (0)