From bbd19551e42c9828d50410ae410b5f92a5ca10a3 Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> Date: Thu, 16 Jun 2022 11:14:04 +0100 Subject: [PATCH] merge bitcoin#25389: use libtool 2.4.7 --- configure.ac | 1 + contrib/guix/manifest.scm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7dc3ba1e90f6f1..6ecfb62e6b2ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ BITCOIN_TX_NAME=dash-tx BITCOIN_WALLET_TOOL_NAME=dash-wallet dnl Unless the user specified ARFLAGS, force it to be cr +dnl This is also the default as-of libtool 2.4.7 AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) if test "x${ARFLAGS+set}" != "xset"; then ARFLAGS="cr" diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 54329023c55576..1ba96be2e48b15 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -604,7 +604,7 @@ parse, modify and abstract ELF, PE and MachO formats.") (list zlib "static") ;; Build tools gnu-make - libtool + libtool-2.4.7 autoconf-2.71 automake pkg-config