Bug#1094387: gcc-15: passes --enable-multiarch twice for staged builds

[Helmut Grohne <helmut@subdivi.de>]

Source: gcc-15
Version: 15-20250114-1
Severity: wishlist
Tags: patch

Hi Matthias,

while looking into a different problem, I accidentally noticed that the
staged builds pass --enable-multiarch twice. debian/rules2 adds it twice
to CONFARGS and one instance can be dropped as the second branch implies
the first. Whether you apply the patch or not, please close this bug.

Helmut

diff --minimal -Nru gcc-15-15-20250114/debian/changelog gcc-15-15-20250114/debian/changelog
--- gcc-15-15-20250114/debian/changelog	2025-01-14 10:43:44.000000000 +0100
+++ gcc-15-15-20250114/debian/changelog	2025-01-27 10:10:37.000000000 +0100
@@ -1,3 +1,10 @@
+gcc-15 (15-20250114-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Only pass --enable-multiarch once for staged builds. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Mon, 27 Jan 2025 10:10:37 +0100
+
 gcc-15 (15-20250114-1) experimental; urgency=medium
 
   * Snapshot, taken from the trunk 20250114.
diff --minimal -Nru gcc-15-15-20250114/debian/rules2 gcc-15-15-20250114/debian/rules2
--- gcc-15-15-20250114/debian/rules2	2025-01-11 14:10:24.000000000 +0100
+++ gcc-15-15-20250114/debian/rules2	2025-01-27 10:10:35.000000000 +0100
@@ -303,11 +303,6 @@
 		$(if $(with_sysroot),--with-sysroot=$(with_sysroot))) \
 	--enable-linker-build-id
 
-  ifeq ($(with_multiarch_lib),yes)
-    CONFARGS += \
-	--enable-multiarch
-  endif
-
   ifeq ($(DEB_STAGE),stage1)
     CONFARGS += \
 	--disable-shared  \