From fa6912a5745ed02f883fba03406949080a5a997b Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 29 Mar 2022 11:13:19 +0200
Subject: [PATCH] debian: simplify LTO configuration to work around newer
 libtool

Libtool 2.4.7 breaks if AR_FLAGS contains a space. See
https://lists.gnu.org/archive/html/bug-libtool/2022-03/msg00009.html

* debian/rules: Use gcc-{nm,ar,ranlib} so we do not have to pass
the plugin explicitly.
---
 debian/rules | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0193e9a62..51daf21ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,16 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@ --with=python3
 
-# Find the LTO plugin, which we need to pass to ar, nm, and ranlib.
-LTOPLUG := $(shell gcc -v 2>&1 | \
-  sed -n 's:COLLECT_LTO_WRAPPER=\(/.*/\)[^/]*:\1:p')liblto_plugin.so
-
 # ARFLAGS is for Automake
-# AR_FLAGS is for Libtool
-# These activate the LTO pluggin, but also remove the 'u' option
-# from ar, since its now ignored with Debian's default to 'D'.
-LTOSETUP =					    \
-  LDFLAGS='-fuse-linker-plugin'			    \
-  NM='nm --plugin $(LTOPLUG)'			    \
-  ARFLAGS='cr --plugin $(LTOPLUG)'		    \
-  AR_FLAGS='cr --plugin $(LTOPLUG)'		    \
-  RANLIB='ranlib --plugin $(LTOPLUG)'		    \
+# AR_FLAGS is for Libtool, (but libtool 2.4.7 will now use ARFLAGS as well)
+# The gcc-tools activate the LTO plugin.
+LTOSETUP =					\
+  LDFLAGS='-fuse-linker-plugin'			\
+  NM='gcc-nm'					\
+  AR='gcc-ar'					\
+  ARFLAGS='cr'					\
+  AR_FLAGS='cr'					\
+  RANLIB='gcc-ranlib'				\
   VALGRIND=false
 GCDADIR := $(shell pwd)/gcda