1 diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
2 --- rpm-4.16.1.2/build/rpmfc.c 2021-03-21 21:51:28.231530270 +0100
3 +++ rpm-4.16.1.2.x32/build/rpmfc.c 2021-03-21 21:50:04.127398387 +0100
6 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
7 { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
8 +// { "ELF 32-bit", RPMFC_ELFX32|RPMFC_INCLUDE },
10 { "troff or preprocessor input", RPMFC_INCLUDE },
11 { "GNU Info", RPMFC_INCLUDE },
13 if (strstr(fmstr, fct->token) == NULL)
16 - fcolor |= fct->colors;
17 + // This is a nasty hack, but will have to do for now
18 + if ((fct->colors & RPMFC_ELF32) && (strstr(fmstr, "x86-64") != NULL))
19 + fcolor |= RPMFC_ELFX32|RPMFC_INCLUDE;
21 + fcolor |= fct->colors;
22 if (fcolor & RPMFC_INCLUDE)
25 @@ -1147,7 +1152,10 @@
29 - color = RPMFC_ELF32;
30 + if (ehdr.e_machine == EM_X86_64)
31 + color = RPMFC_ELFX32;
33 + color = RPMFC_ELF32;
37 diff -ur rpm-4.16.1.2/build/rpmfc.h rpm-4.16.1.2.x32/build/rpmfc.h
38 --- rpm-4.16.1.2/build/rpmfc.h 2020-05-28 12:04:25.011136544 +0200
39 +++ rpm-4.16.1.2.x32/build/rpmfc.h 2021-03-21 21:50:04.127398387 +0100
42 RPMFC_ELF32 = (1 << 0),
43 RPMFC_ELF64 = (1 << 1),
44 + RPMFC_ELFX32 = (1 << 2),
45 RPMFC_ELFMIPSN32 = (1 << 2),
46 -#define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32)
47 +#define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFX32|RPMFC_ELFMIPSN32)
48 /* (1 << 3) leaks into package headers, reserved */
50 RPMFC_WHITE = (1 << 29),
51 diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac
52 --- rpm-4.16.1.2/configure.ac 2021-03-21 21:51:28.221530479 +0100
53 +++ rpm-4.16.1.2.x32/configure.ac 2021-03-21 21:50:04.127398387 +0100
55 host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`
58 +if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
59 + host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
62 if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
63 host_os=`echo "${host_os}" | sed 's/-gnu$//'`
65 diff -ur rpm-4.16.1.2/fileattrs/python.attr rpm-4.16.1.2.x32/fileattrs/python.attr
66 --- rpm-4.16.1.2/fileattrs/python.attr 2020-08-31 11:14:07.991087349 +0200
67 +++ rpm-4.16.1.2.x32/fileattrs/python.attr 2021-03-21 21:50:04.127398387 +0100
69 %__python_requires() %{lua:
70 -- Match buildroot paths of the form
71 -- /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/ and
72 - -- /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
73 + -- /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ and
74 + -- /PATH/OF/BUILDROOT/usr/libx32/pythonMAJOR.MINOR/
75 -- generating a line of the form:
76 -- python(abi) = MAJOR.MINOR
77 local path = rpm.expand('%1')
78 - if path:match('/usr/lib%d*/python%d+%.%d+/.*') then
79 - local requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1')
80 + if path:match('/usr/lib%w*/python%d+%.%d+/.*') then
81 + local requires = path:gsub('.*/usr/lib%w*/python(%d+%.%d+)/.*', 'python(abi) = %1')
86 -%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
87 +%__python_path ^((%{_prefix}/lib(64|x32)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
88 diff -ur rpm-4.16.1.2/fileattrs/pythondist.attr rpm-4.16.1.2.x32/fileattrs/pythondist.attr
89 --- rpm-4.16.1.2/fileattrs/pythondist.attr 2020-05-28 12:04:25.026136626 +0200
90 +++ rpm-4.16.1.2.x32/fileattrs/pythondist.attr 2021-03-21 21:50:04.127398387 +0100
92 %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
93 %__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
94 -%__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
95 +%__pythondist_path /lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
96 diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
97 --- rpm-4.16.1.2/installplatform 2020-05-28 12:04:25.027136631 +0200
98 +++ rpm-4.16.1.2.x32/installplatform 2021-03-21 21:51:47.671145954 +0100
101 ARCH_INSTALL_POST='%{nil}'
103 + TARGETCPU="%{_target_cpu}"
107 # XXX FIXME: incomplete and quite likely wrong too in places,
108 # consult various arch folks for correct names etc.
121 + APPEND_TARGET_ABI=1
127 @@ -190,10 +200,14 @@
128 # skip architectures for which we dont have full config parameters
129 [ -z "$CANONARCH" ] && continue
131 - if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
132 + if [ "$OS" = "linux" ] && ( [ "$CANONCOLOR" = 3 ] || [ "$CANONARCH" = "x86_64" ] ); then
136 + if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x32" ]; then
140 PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
141 [ -d $PPD ] || mkdir -p $PPD
144 | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
145 -e "s,@RPMCANONARCH@,$CANONARCH,g" \
146 -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
147 + -e "s,@RPMPREFERCOLOR@,${PREFERCOLOR:+%_prefer_color\\t$PREFERCOLOR}," \
148 -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
149 + -e "s,@TARGET_ABI@,${APPEND_TARGET_ABI:+%{?_gnu\}}," \
150 + -e "s,@TARGETCPU@,$TARGETCPU," \
152 -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
153 -e '/\${\w*:-/!s,\${,%{_,' \
154 diff -ur rpm-4.16.1.2/platform.in rpm-4.16.1.2.x32/platform.in
155 --- rpm-4.16.1.2/platform.in 2020-05-28 12:04:25.047136741 +0200
156 +++ rpm-4.16.1.2.x32/platform.in 2021-03-21 21:51:47.671145954 +0100
158 %_vendor @RPMCANONVENDOR@
161 -%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
162 +%_target_platform @TARGETCPU@-%{_vendor}-%{_target_os}@TARGET_ABI@
163 %optflags @RPMRC_OPTFLAGS@
165 %__isa_name @ISANAME@
169 %_transaction_color @RPMCANONCOLOR@
172 #==============================================================================
173 # ---- configure macros.
174 diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in
175 --- rpm-4.16.1.2/rpmrc.in 2020-05-28 12:04:25.075136894 +0200
176 +++ rpm-4.16.1.2.x32/rpmrc.in 2021-03-21 21:50:04.127398387 +0100
178 optflags: x86_64 -O2 -g
179 optflags: amd64 -O2 -g
180 optflags: ia32e -O2 -g
181 +optflags: x32 -O2 -g -mtune=generic -march=x86-64
183 optflags: alpha -O2 -g -mieee
184 optflags: alphaev5 -O2 -g -mieee -mtune=ev5
191 #############################################################
192 # Canonical arch names and numbers
195 arch_canon: amd64: amd64 1
196 arch_canon: ia32e: ia32e 1
197 arch_canon: em64t: em64t 1
198 +arch_canon: x32: x32 1
200 arch_canon: alpha: alpha 2
201 arch_canon: alphaev5: alphaev5 2
203 buildarchtranslate: amd64: x86_64
204 buildarchtranslate: ia32e: x86_64
206 +buildarchtranslate: x32: x32
208 buildarchtranslate: sh3: sh3
209 buildarchtranslate: sh4: sh4
210 buildarchtranslate: sh4a: sh4
211 @@ -486,10 +492,12 @@
213 arch_compat: ia64: noarch
215 -arch_compat: x86_64: amd64 em64t athlon noarch
216 +arch_compat: x86_64: amd64 em64t athlon x32 noarch
217 arch_compat: amd64: x86_64 em64t athlon noarch
218 arch_compat: ia32e: x86_64 em64t athlon noarch
220 +arch_compat: x32: x32 x86_64 noarch
222 arch_compat: sh3: noarch
223 arch_compat: sh4: noarch
224 arch_compat: sh4a: sh4
226 buildarch_compat: amd64: x86_64
227 buildarch_compat: ia32e: x86_64
229 +buildarch_compat: x32: noarch
231 buildarch_compat: sh3: noarch
232 buildarch_compat: sh4: noarch
233 buildarch_compat: sh4a: sh4
234 diff -ur rpm-4.16.1.2/tools/elfdeps.c rpm-4.16.1.2.x32/tools/elfdeps.c
235 --- rpm-4.16.1.2/tools/elfdeps.c 2020-05-28 12:04:25.084136944 +0200
236 +++ rpm-4.16.1.2.x32/tools/elfdeps.c 2021-03-21 21:50:04.127398387 +0100
241 + if ((ehdr->e_ident[EI_CLASS] == ELFCLASS32) && (ehdr->e_machine == EM_X86_64)) {
242 + marker = "(x32bit)";