Skip to content

Commit 15710ae

Browse files
laanwjgades
authored andcommitted
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
1 parent 8618f78 commit 15710ae

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

configure.ac

+4-11
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ fi
8686
AC_PROG_OBJCXX
8787
])
8888

89+
dnl Since libtool 1.5.2 (released 2004-01-25), on Linux libtool no longer
90+
dnl sets RPATH for any directories in the dynamic linker search path.
91+
dnl See more: https://wiki.debian.org/RpathIssue
92+
LT_PREREQ([1.5.2])
8993
dnl Libtool init checks.
9094
LT_INIT([pic-only])
9195

@@ -1733,17 +1737,6 @@ AC_CONFIG_SUBDIRS([src/secp256k1])
17331737

17341738
AC_OUTPUT
17351739

1736-
dnl Taken from https://wiki.debian.org/RpathIssue
1737-
case $host in
1738-
*-*-linux-gnu)
1739-
AC_MSG_RESULT([Fixing libtool for -rpath problems.])
1740-
sed < libtool > libtool-2 \
1741-
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
1742-
mv libtool-2 libtool
1743-
chmod 755 libtool
1744-
;;
1745-
esac
1746-
17471740
dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows
17481741
case ${OS} in
17491742
*Windows*)

0 commit comments

Comments
 (0)