From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 25 Mar 2023 19:22:54 +0000 (+0100)
Subject: glibc: Disable multilib support on X86_64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=people%2Fstevee%2Fipfire-3.x.git

glibc: Disable multilib support on X86_64

This requires a 32bit glibc to link against, which we do not have.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 011329e66..cf0274268 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_graphite = 1
 
 name       = gcc
 version    = 12.2.0
-release    = 4
+release    = 5
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -148,8 +148,8 @@ build
 
 	if "%{DISTRO_ARCH}" == "x86_64"
 		configure_options += \
+			--disable-multilib \
 			--with-arch_64=x86-64-v2 \
-			--with-arch_32=x86-64 \
 			--enable-cet \
 			--with-tune=generic
 	end