From d0af2063b2f5029a6ed7ec7b81dc9a1500064e2c Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <mwhudson@debian.org>
Date: Mon, 14 Jul 2025 20:30:45 +0000
Subject: [PATCH] multilib

Gbp-Pq: Name multilib.patch
---
 cmd/snap-seccomp/main_test.go                 |  3 +-
 .../store/test-snapd-daemon-user/src/Makefile | 55 ++++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/cmd/snap-seccomp/main_test.go b/cmd/snap-seccomp/main_test.go
index 79b338fb..8bd9f024 100644
--- a/cmd/snap-seccomp/main_test.go
+++ b/cmd/snap-seccomp/main_test.go
@@ -226,8 +226,7 @@ func (s *snapSeccompSuite) SetUpSuite(c *C) {
 	// Ideally we would build for ppc64el->powerpc and arm64->armhf but
 	// it seems tricky to find the right gcc-multilib for this.
 	if arch.DpkgArchitecture() == "amd64" && s.canCheckCompatArch {
-		cmd = exec.Command(cmd.Args[0], cmd.Args[1:]...)
-		cmd.Args = append(cmd.Args, "-m32")
+		cmd = exec.Command("i686-linux-gnu-gcc", cmd.Args[1:]...)
 		for i, k := range cmd.Args {
 			if k == s.seccompSyscallRunner {
 				cmd.Args[i] = s.seccompSyscallRunner + ".m32"
diff --git a/tests/lib/snaps/store/test-snapd-daemon-user/src/Makefile b/tests/lib/snaps/store/test-snapd-daemon-user/src/Makefile
index e9dedc72..bcbc2bf2 100644
--- a/tests/lib/snaps/store/test-snapd-daemon-user/src/Makefile
+++ b/tests/lib/snaps/store/test-snapd-daemon-user/src/Makefile
@@ -117,86 +117,87 @@ fchownat: display.o fchownat.o
 
 #ifneq (,$(filter $(arch_triplet), x86_64-linux-gnu aarch64-linux-gnu))
 ifneq (,$(filter $(arch_triplet), x86_64-linux-gnu))
+CC_M32 ?= i686-linux-gnu-gcc
 display32.o: display32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 drop32.o: drop32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 drop32: display32.o drop32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 drop-exec32.o: drop-exec32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 drop-exec32: display32.o drop-exec32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 drop-syscall32.o: drop-syscall32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 drop-syscall32: display32.o drop-syscall32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setgid32.o: setgid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setgid32: display32.o setgid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setregid32.o: setregid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setregid32: display32.o setregid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setresgid32.o: setresgid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setresgid32: display32.o setresgid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setuid32.o: setuid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setuid32: display32.o setuid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setreuid32.o: setreuid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setreuid32: display32.o setreuid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 setresuid32.o: setresuid32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 setresuid32: display32.o setresuid32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 chown32.o: chown32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 chown32: display32.o chown32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 lchown32.o: lchown32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 lchown32: display32.o lchown32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 fchown32.o: fchown32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 fchown32: display32.o fchown32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 
 fchownat32.o: fchownat32.c
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS}
 
 fchownat32: display32.o fchownat32.o
-	${CC} -m32 ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
+	${CC_M32} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS}
 endif
 
 
-- 
2.30.2