]> git.pld-linux.org Git - packages/rpm.git/blob - x32.patch
- platform fixes
[packages/rpm.git] / x32.patch
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
4 @@ -595,6 +595,7 @@
5  
6    { "ELF 32-bit",              RPMFC_ELF32|RPMFC_INCLUDE },
7    { "ELF 64-bit",              RPMFC_ELF64|RPMFC_INCLUDE },
8 +//  { "ELF 32-bit",            RPMFC_ELFX32|RPMFC_INCLUDE },
9  
10    { "troff or preprocessor input",     RPMFC_INCLUDE },
11    { "GNU Info",                        RPMFC_INCLUDE },
12 @@ -696,7 +697,11 @@
13         if (strstr(fmstr, fct->token) == NULL)
14             continue;
15  
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;
20 +       else
21 +           fcolor |= fct->colors;
22         if (fcolor & RPMFC_INCLUDE)
23             break;
24      }
25 diff -ur rpm-4.15.1.orig/build/rpmfc.h rpm-4.15.1/build/rpmfc.h
26 --- rpm-4.15.1.orig/build/rpmfc.h       2019-06-26 16:17:31.397985717 +0200
27 +++ rpm-4.15.1/build/rpmfc.h    2019-12-29 13:45:05.936980833 +0100
28 @@ -26,8 +26,9 @@
29      RPMFC_BLACK                        = 0,
30      RPMFC_ELF32                        = (1 <<  0),
31      RPMFC_ELF64                        = (1 <<  1),
32 +    RPMFC_ELFX32               = (1 <<  2),
33      RPMFC_ELFMIPSN32           = (1 <<  2),
34 -#define        RPMFC_ELF       (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32)
35 +#define        RPMFC_ELF       (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFX32|RPMFC_ELFMIPSN32)
36         /* (1 << 3) leaks into package headers, reserved */
37  
38      RPMFC_WHITE                        = (1 << 29),
39 diff -ur rpm-4.15.1.orig/configure.ac rpm-4.15.1/configure.ac
40 --- rpm-4.15.1.orig/configure.ac        2019-12-29 14:07:19.813977936 +0100
41 +++ rpm-4.15.1/configure.ac     2019-12-29 14:27:41.381850928 +0100
42 @@ -1050,6 +1050,9 @@
43         host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`
44         host_os_gnu=-gnueabi
45  fi
46 +if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
47 +       host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
48 +fi
49  if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
50         host_os=`echo "${host_os}" | sed 's/-gnu$//'`
51  fi
52 diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
53 --- rpm-4.15.1.orig/installplatform     2019-06-26 16:17:31.404985707 +0200
54 +++ rpm-4.15.1/installplatform  2019-12-29 14:52:09.331085139 +0100
55 @@ -21,6 +21,7 @@
56  
57    ARCH_INSTALL_POST='%{nil}'
58    LIB=lib
59 +  TARGETCPU="%{_target_cpu}"
60  
61    # XXX FIXME: incomplete and quite likely wrong too in places,
62    # consult various arch folks for correct names etc.
63 @@ -82,7 +83,15 @@
64         ISANAME=x86
65         ISABITS=64
66         CANONARCH=x86_64
67 -       CANONCOLOR=3
68 +       CANONCOLOR=7
69 +       ;;
70 +    x32)
71 +       ISANAME=x86
72 +       ISABITS=32
73 +       CANONARCH=x32
74 +       CANONCOLOR=4
75 +       FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
76 +       TARGETCPU="x86_64"
77         ;;
78      ia64)
79         ISANAME=ia
80 @@ -190,10 +199,14 @@
81    # skip architectures for which we dont have full config parameters
82    [ -z "$CANONARCH" ] && continue
83  
84 -  if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
85 +  if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x86_64" ]; then
86        LIB=${LIB}64
87    fi
88  
89 +  if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x32" ]; then
90 +      LIB=${LIB}x32
91 +  fi
92 +
93    PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
94    [ -d $PPD ] || mkdir -p $PPD
95  
96 @@ -201,7 +214,8 @@
97    | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
98         -e "s,@RPMCANONARCH@,$CANONARCH,g" \
99         -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
100 -       -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
101 +       -e "s,@RPMRC_GNU@,${FORCE_RPMRC_GNU:-$RPMRC_GNU}," \
102 +       -e "s,@TARGETCPU@,$TARGETCPU," \
103         -e "s,@LIB@,$LIB," \
104         -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
105         -e '/\${\w*:-/!s,\${,%{_,' \
106 @@ -212,6 +226,8 @@
107    | ${FILTER} \
108    > ${PPD}/macros
109  
110 +  FORCE_RPMRC_GNU=
111 +
112  done
113  
114  # gently adjust undefined autoconf variables to rpm macros...
115 diff -ur rpm-4.15.1.orig/platform.in rpm-4.15.1/platform.in
116 --- rpm-4.15.1.orig/platform.in 2019-11-13 10:19:29.371710954 +0100
117 +++ rpm-4.15.1/platform.in      2019-12-29 14:47:30.886959421 +0100
118 @@ -8,7 +8,7 @@
119  %_vendor               @RPMCANONVENDOR@
120  %_os                   @RPMCANONOS@
121  %_gnu                  @RPMRC_GNU@
122 -%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
123 +%_target_platform      @TARGETCPU@-%{_vendor}-%{_target_os}%{?_gnu}
124  %optflags              @RPMRC_OPTFLAGS@
125  
126  %__isa_name            @ISANAME@
127 diff -ur rpm-4.15.1.orig/rpmrc.in rpm-4.15.1/rpmrc.in
128 --- rpm-4.15.1.orig/rpmrc.in    2019-11-13 10:19:29.418711227 +0100
129 +++ rpm-4.15.1/rpmrc.in 2019-12-29 14:51:20.293119352 +0100
130 @@ -24,6 +24,7 @@
131  optflags: x86_64 -O2 -g
132  optflags: amd64 -O2 -g
133  optflags: ia32e -O2 -g
134 +optflags: x32 -O2 -g -mtune=generic -march=x86-64
135  
136  optflags: alpha -O2 -g -mieee
137  optflags: alphaev5 -O2 -g -mieee -mtune=ev5
138 @@ -155,6 +156,8 @@
139  
140  archcolor: riscv64 2
141  
142 +archcolor: x32 4
143 +
144  #############################################################
145  # Canonical arch names and numbers
146  
147 @@ -170,6 +173,7 @@
148  arch_canon:    amd64:  amd64   1
149  arch_canon:    ia32e:  ia32e   1
150  arch_canon:    em64t:  em64t   1
151 +arch_canon:    x32: x32        1
152  
153  arch_canon:    alpha:  alpha   2
154  arch_canon:    alphaev5: alphaev5      2
155 @@ -379,6 +383,8 @@
156  buildarchtranslate: amd64: x86_64
157  buildarchtranslate: ia32e: x86_64
158  
159 +buildarchtranslate: x32: x32
160 +
161  buildarchtranslate: sh3: sh3
162  buildarchtranslate: sh4: sh4
163  buildarchtranslate: sh4a: sh4
164 @@ -490,6 +496,8 @@
165  arch_compat: amd64: x86_64 em64t athlon noarch
166  arch_compat: ia32e: x86_64 em64t athlon noarch
167  
168 +arch_compat: x32: x32 noarch
169 +
170  arch_compat: sh3: noarch
171  arch_compat: sh4: noarch
172  arch_compat: sh4a: sh4
173 @@ -628,6 +636,8 @@
174  buildarch_compat: amd64: x86_64
175  buildarch_compat: ia32e: x86_64
176  
177 +buildarch_compat: x32: noarch
178 +
179  buildarch_compat: sh3: noarch
180  buildarch_compat: sh4: noarch
181  buildarch_compat: sh4a: sh4
182 diff -ur rpm-4.15.1.orig/tools/elfdeps.c rpm-4.15.1/tools/elfdeps.c
183 --- rpm-4.15.1.orig/tools/elfdeps.c     2019-06-26 16:17:31.462985619 +0200
184 +++ rpm-4.15.1/tools/elfdeps.c  2019-12-29 14:22:05.339471071 +0100
185 @@ -94,6 +94,9 @@
186             break;
187         }
188      }
189 +    if ((ehdr->e_ident[EI_CLASS] == ELFCLASS32) && (ehdr->e_machine == EM_X86_64)) {
190 +       marker = "(x32bit)";
191 +    }
192      return marker;
193  }
194  
195 --- rpm-4.15.1/fileattrs/pythondist.attr~       2019-06-26 23:17:31.000000000 +0900
196 +++ rpm-4.15.1/fileattrs/pythondist.attr        2020-01-04 23:34:05.680366882 +0900
197 @@ -1,3 +1,3 @@
198  %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
199  %__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
200 -%__pythondist_path             /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
201 +%__pythondist_path             /lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
202 --- rpm-4.16.0/fileattrs/python.attr.orig       2020-08-31 11:14:07.991087349 +0200
203 +++ rpm-4.16.0/fileattrs/python.attr    2020-10-03 10:47:16.560360859 +0200
204 @@ -14,14 +14,15 @@
205  %__python_requires() %{lua:
206      -- Match buildroot paths of the form
207      --    /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/  and
208 -    --    /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
209 +    --    /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ and
210 +    --    /PATH/OF/BUILDROOT/usr/libx32/pythonMAJOR.MINOR/
211      -- generating a line of the form:
212      --    python(abi) = MAJOR.MINOR
213      local path = rpm.expand('%1')
214 -    if path:match('/usr/lib%d*/python%d+%.%d+/.*') then
215 -        local requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1')
216 +    if path:match('/usr/lib%w*/python%d+%.%d+/.*') then
217 +        local requires = path:gsub('.*/usr/lib%w*/python(%d+%.%d+)/.*', 'python(abi) = %1')
218          print(requires)
219      end
220  }
221  
222 -%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
223 +%__python_path ^((%{_prefix}/lib(64|x32)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
This page took 0.082656 seconds and 3 git commands to generate.