1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
From: Michael Hudson-Doyle <mwhudson@debian.org>
Date: Mon, 14 Jul 2025 20:30:45 +0000
Subject: cmd/snap-seccomp: use i386 cross-compiler instead of multilib
Forwarded: https://github.com/canonical/snapd/pull/15852
Origin: upstream
Last-Update: 2025-11-21
Multilib gcc has been deprecated.
---
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 0a1787f..4786e83 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 e9dedc7..bcbc2bf 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
|
