1 diff -ur rpm-4.15.1.orig/build/rpmfc.c rpm-4.15.1/build/rpmfc.c
2 --- rpm-4.15.1.orig/build/rpmfc.c 2019-12-29 14:07:19.877313873 +0100
3 +++ rpm-4.15.1/build/rpmfc.c 2019-12-29 13:47:23.183804165 +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 @@ -1152,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.15.1.orig/build/rpmfc.h rpm-4.15.1/build/rpmfc.h
38 --- rpm-4.15.1.orig/build/rpmfc.h 2019-06-26 16:17:31.397985717 +0200
39 +++ rpm-4.15.1/build/rpmfc.h 2019-12-29 13:45:05.936980833 +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.15.1.orig/configure.ac rpm-4.15.1/configure.ac
52 --- rpm-4.15.1.orig/configure.ac 2019-12-29 14:07:19.813977936 +0100
53 +++ rpm-4.15.1/configure.ac 2019-12-29 14:27:41.381850928 +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$//'`
61 if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
62 host_os=`echo "${host_os}" | sed 's/-gnu$//'`
64 diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
65 --- rpm-4.15.1.orig/installplatform 2019-06-26 16:17:31.404985707 +0200
66 +++ rpm-4.15.1/installplatform 2019-12-29 14:52:09.331085139 +0100
69 ARCH_INSTALL_POST='%{nil}'
71 + TARGETCPU="%{_target_cpu}"
73 # XXX FIXME: incomplete and quite likely wrong too in places,
74 # consult various arch folks for correct names etc.
87 + FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
93 # skip architectures for which we dont have full config parameters
94 [ -z "$CANONARCH" ] && continue
96 - if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
97 + if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x86_64" ]; then
101 + if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x32" ]; then
105 PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
106 [ -d $PPD ] || mkdir -p $PPD
109 | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
110 -e "s,@RPMCANONARCH@,$CANONARCH,g" \
111 -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
112 - -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
113 + -e "s,@RPMRC_GNU@,${FORCE_RPMRC_GNU:-$RPMRC_GNU}," \
114 + -e "s,@TARGETCPU@,$TARGETCPU," \
116 -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
117 -e '/\${\w*:-/!s,\${,%{_,' \
126 # gently adjust undefined autoconf variables to rpm macros...
127 diff -ur rpm-4.15.1.orig/platform.in rpm-4.15.1/platform.in
128 --- rpm-4.15.1.orig/platform.in 2019-11-13 10:19:29.371710954 +0100
129 +++ rpm-4.15.1/platform.in 2019-12-29 14:47:30.886959421 +0100
131 %_vendor @RPMCANONVENDOR@
134 -%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
135 +%_target_platform @TARGETCPU@-%{_vendor}-%{_target_os}%{?_gnu}
136 %optflags @RPMRC_OPTFLAGS@
138 %__isa_name @ISANAME@
139 diff -ur rpm-4.15.1.orig/rpmrc.in rpm-4.15.1/rpmrc.in
140 --- rpm-4.15.1.orig/rpmrc.in 2019-11-13 10:19:29.418711227 +0100
141 +++ rpm-4.15.1/rpmrc.in 2019-12-29 14:51:20.293119352 +0100
143 optflags: x86_64 -O2 -g
144 optflags: amd64 -O2 -g
145 optflags: ia32e -O2 -g
146 +optflags: x32 -O2 -g -mtune=generic -march=x86-64
148 optflags: alpha -O2 -g -mieee
149 optflags: alphaev5 -O2 -g -mieee -mtune=ev5
156 #############################################################
157 # Canonical arch names and numbers
160 arch_canon: amd64: amd64 1
161 arch_canon: ia32e: ia32e 1
162 arch_canon: em64t: em64t 1
163 +arch_canon: x32: x32 1
165 arch_canon: alpha: alpha 2
166 arch_canon: alphaev5: alphaev5 2
168 buildarchtranslate: amd64: x86_64
169 buildarchtranslate: ia32e: x86_64
171 +buildarchtranslate: x32: x32
173 buildarchtranslate: sh3: sh3
174 buildarchtranslate: sh4: sh4
175 buildarchtranslate: sh4a: sh4
176 @@ -486,10 +492,12 @@
178 arch_compat: ia64: noarch
180 -arch_compat: x86_64: amd64 em64t athlon noarch
181 +arch_compat: x86_64: amd64 em64t athlon x32 noarch
182 arch_compat: amd64: x86_64 em64t athlon noarch
183 arch_compat: ia32e: x86_64 em64t athlon noarch
185 +arch_compat: x32: x32 x86_64 noarch
187 arch_compat: sh3: noarch
188 arch_compat: sh4: noarch
189 arch_compat: sh4a: sh4
191 buildarch_compat: amd64: x86_64
192 buildarch_compat: ia32e: x86_64
194 +buildarch_compat: x32: noarch
196 buildarch_compat: sh3: noarch
197 buildarch_compat: sh4: noarch
198 buildarch_compat: sh4a: sh4
199 diff -ur rpm-4.15.1.orig/tools/elfdeps.c rpm-4.15.1/tools/elfdeps.c
200 --- rpm-4.15.1.orig/tools/elfdeps.c 2019-06-26 16:17:31.462985619 +0200
201 +++ rpm-4.15.1/tools/elfdeps.c 2019-12-29 14:22:05.339471071 +0100
206 + if ((ehdr->e_ident[EI_CLASS] == ELFCLASS32) && (ehdr->e_machine == EM_X86_64)) {
207 + marker = "(x32bit)";
212 --- rpm-4.15.1/fileattrs/pythondist.attr~ 2019-06-26 23:17:31.000000000 +0900
213 +++ rpm-4.15.1/fileattrs/pythondist.attr 2020-01-04 23:34:05.680366882 +0900
215 %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
216 %__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
217 -%__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
218 +%__pythondist_path /lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
219 --- rpm-4.16.0/fileattrs/python.attr.orig 2020-08-31 11:14:07.991087349 +0200
220 +++ rpm-4.16.0/fileattrs/python.attr 2020-10-03 10:47:16.560360859 +0200
222 %__python_requires() %{lua:
223 -- Match buildroot paths of the form
224 -- /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/ and
225 - -- /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
226 + -- /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ and
227 + -- /PATH/OF/BUILDROOT/usr/libx32/pythonMAJOR.MINOR/
228 -- generating a line of the form:
229 -- python(abi) = MAJOR.MINOR
230 local path = rpm.expand('%1')
231 - if path:match('/usr/lib%d*/python%d+%.%d+/.*') then
232 - local requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1')
233 + if path:match('/usr/lib%w*/python%d+%.%d+/.*') then
234 + local requires = path:gsub('.*/usr/lib%w*/python(%d+%.%d+)/.*', 'python(abi) = %1')
239 -%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
240 +%__python_path ^((%{_prefix}/lib(64|x32)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$