1 --- rpm-4.3.orig/rpmrc.in Mon Apr 28 16:04:32 2003
2 +++ rpm-4.3/rpmrc.in Thu May 1 17:46:04 2003
4 #############################################################
5 # Values for RPM_OPT_FLAGS for various platforms
7 -optflags: i386 -O2 -march=i386
8 +optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
9 #optflags: i386 -O2 -march=i386 -mcpu=i686
10 -optflags: i486 -O2 -march=i486
11 -optflags: i586 -O2 -march=i586
12 -optflags: i686 -O2 -march=i686
13 -optflags: athlon -O2 -march=athlon
17 -optflags: alpha -O2 -mieee
18 -optflags: alphaev5 -O2 -mieee -mcpu=ev5
19 -optflags: alphaev56 -O2 -mieee -mcpu=ev56
20 -optflags: alphapca56 -O2 -mieee -mcpu=pca56
21 -optflags: alphaev6 -O2 -mieee -mcpu=ev6
22 -optflags: alphaev67 -O2 -mieee -mcpu=ev67
24 -optflags: sparc -O2 -m32 -mtune=ultrasparc
25 -optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc
26 -optflags: sparc64 -O2 -m64 -mcpu=ultrasparc
28 -optflags: m68k -O2 -fomit-frame-pointer
30 -optflags: ppc -O2 -fsigned-char
31 -optflags: ppciseries -O2 -fsigned-char
32 -optflags: ppcpseries -O2 -fsigned-char
33 -optflags: ppc64 -O2 -fsigned-char
35 -optflags: parisc -O2 -mpa-risc-1-0
36 -optflags: hppa1.0 -O2 -mpa-risc-1-0
37 -optflags: hppa1.1 -O2 -mpa-risc-1-0
38 -optflags: hppa1.2 -O2 -mpa-risc-1-0
39 -optflags: hppa2.0 -O2 -mpa-risc-1-0
44 -optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3
45 -optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4
46 -optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4
48 -optflags: atarist -O2 -fomit-frame-pointer
49 -optflags: atariste -O2 -fomit-frame-pointer
50 -optflags: ataritt -O2 -fomit-frame-pointer
51 -optflags: falcon -O2 -fomit-frame-pointer
52 -optflags: atariclone -O2 -fomit-frame-pointer
53 -optflags: milan -O2 -fomit-frame-pointer
54 -optflags: hades -O2 -fomit-frame-pointer
55 +optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
56 +optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
57 +optflags: i686 -O2 -march=i686%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}}
58 +optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}}
59 +optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}}
60 +optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}}
62 +optflags: alpha -O2 -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}}
63 +optflags: alphaev5 -O2 -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}}
64 +optflags: alphaev56 -O2 -mieee -mcpu=ev56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev56: %{specflags_alphaev56}}}
65 +optflags: alphapca56 -O2 -mieee -mcpu=pca56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphapca56: %{specflags_alphapca56}}}
66 +optflags: alphaev6 -O2 -mieee -mcpu=ev6%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev6: %{specflags_alphaev6}}}
67 +optflags: alphaev67 -O2 -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}}
69 +optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}}
70 +optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}}
71 +optflags: sparc64 -O2 -m64 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
73 +optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}}
75 +optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
76 +optflags: ppciseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppciseries: %{specflags_ppciseries}}}
77 +optflags: ppcpseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}}
78 +optflags: ppc64 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppc64: %{specflags_ppc64}}}
80 +optflags: parisc -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}}
81 +optflags: hppa1.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}}
82 +optflags: hppa1.1 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_1: %{specflags_hppa1_1}}}
83 +optflags: hppa1.2 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_2: %{specflags_hppa1_2}}}
84 +optflags: hppa2.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa2_0: %{specflags_hppa2_0}}}
86 +optflags: mips -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}}
87 +optflags: mipsel -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}%{?specflags_mipsel: %{specflags_mipsel}}}
89 +optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv3l: %{specflags_armv3l}}}
90 +optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4b: %{specflags_armv4b}}}
91 +optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4l: %{specflags_armv4l}}}
93 +optflags: atarist -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atarist: %{specflags_atarist}}}
94 +optflags: atariste -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariste: %{specflags_atariste}}}
95 +optflags: ataritt -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ataritt: %{specflags_ataritt}}}
96 +optflags: falcon -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_falcon: %{specflags_falcon}}}
97 +optflags: atariclone -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}}
98 +optflags: milan -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}}
99 +optflags: hades -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}}
103 +optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
104 +optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
106 #############################################################
107 # Canonical arch names and numbers
108 --- rpm-4.3.orig/macros.in Mon Apr 28 16:04:32 2003
109 +++ rpm-4.3/macros.in Thu May 1 18:08:53 2003
110 @@ -1505,3 +1505,46 @@
111 %xmms_effect_plugindir %(xmms-config --effect-plugin-dir)
112 %xmms_general_plugindir %(xmms-config --general-plugin-dir)
114 +# don't define as empty (some autoconf issues when CFLAGS end with multiple spaces)
116 +#%specflags_ia32 %{nil}
117 +#%specflags_i386 %{nil}
118 +#%specflags_i486 %{nil}
119 +#%specflags_i586 %{nil}
120 +#%specflags_i686 %{nil}
121 +#%specflags_athlon %{nil}
122 +#%specflags_ia64 %{nil}
123 +#%specflags_x86_64 %{nil}
124 +#%specflags_alpha %{nil}
125 +#%specflags_alphaev5 %{nil}
126 +#%specflags_alphaev56 %{nil}
127 +#%specflags_alphapca56 %{nil}
128 +#%specflags_alphaev6 %{nil}
129 +#%specflags_alphaev67 %{nil}
130 +#%specflags_sparc %{nil}
131 +#%specflags_sparcv9 %{nil}
132 +#%specflags_sparc64 %{nil}
133 +#%specflags_m68k %{nil}
134 +#%specflags_ppc %{nil}
135 +#%specflags_ppciseries %{nil}
136 +#%specflags_ppcpseries %{nil}
137 +#%specflags_ppc64 %{nil}
138 +#%specflags_parisc %{nil}
139 +#%specflags_hppa1_0 %{nil}
140 +#%specflags_hppa1_1 %{nil}
141 +#%specflags_hppa1_1 %{nil}
142 +#%specflags_hppa2_0 %{nil}
143 +#%specflags_mips %{nil}
144 +#%specflags_mipsel %{nil}
145 +#%specflags_armv3l %{nil}
146 +#%specflags_armv4b %{nil}
147 +#%specflags_armv4l %{nil}
148 +#%specflags_atarist %{nil}
149 +#%specflags_atariste %{nil}
150 +#%specflags_ataritt %{nil}
151 +#%specflags_falcon %{nil}
152 +#%specflags_atariclone %{nil}
153 +#%specflags_milan %{nil}
154 +#%specflags_hades %{nil}
155 +#%specflags_s390 %{nil}
156 +#%specflags_s390x %{nil}