]>
Commit | Line | Data |
---|---|---|
1 | --- rpm-4.4.8/rpmrc.in.orig 2007-02-03 21:02:07.000000000 +0100 | |
2 | +++ rpm-4.4.8/rpmrc.in 2007-04-08 10:43:32.083363453 +0200 | |
3 | @@ -13,69 +13,67 @@ | |
4 | # Values for RPM_OPT_FLAGS for various platforms | |
5 | ||
6 | # "fat" binary with both archs, for Darwin | |
7 | -optflags: fat -O2 -g -arch i386 -arch ppc | |
8 | +optflags: fat -O2 -arch i386 -arch ppc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_fat: %{specflags_fat}}} | |
9 | ||
10 | -optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables | |
11 | -optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables | |
12 | -optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables | |
13 | -optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables | |
14 | -optflags: pentium3 -O2 -g -m32 -march=pentium3 -fasynchronous-unwind-tables | |
15 | -optflags: pentium4 -O2 -g -m32 -march=pentium4 -fasynchronous-unwind-tables | |
16 | -optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables | |
17 | -optflags: ia64 -O2 -g | |
18 | -optflags: x86_64 -O2 -g -m64 -mtune=generic | |
19 | -optflags: amd64 -O2 -g -m64 -mtune=generic | |
20 | -optflags: ia32e -O2 -g -m64 -mtune=generic | |
21 | - | |
22 | -optflags: alpha -O2 -g -mieee | |
23 | -optflags: alphaev5 -O2 -g -mieee -mcpu=ev5 | |
24 | -optflags: alphaev56 -O2 -g -mieee -mcpu=ev56 | |
25 | -optflags: alphapca56 -O2 -g -mieee -mcpu=pca56 | |
26 | -optflags: alphaev6 -O2 -g -mieee -mcpu=ev6 | |
27 | -optflags: alphaev67 -O2 -g -mieee -mcpu=ev67 | |
28 | - | |
29 | -optflags: sparc -O2 -g -m32 -mcpu=v7 -mtune=ultrasparc | |
30 | -optflags: sparcv8 -O2 -g -m32 -mcpu=v8 -mtune=ultrasparc | |
31 | -optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc | |
32 | -optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc | |
33 | - | |
34 | -optflags: m68k -O2 -g -fomit-frame-pointer | |
35 | - | |
36 | -optflags: ppc -O2 -g -m32 | |
37 | -optflags: ppc8260 -O2 -g -m32 | |
38 | -optflags: ppc8560 -O2 -g -m32 | |
39 | -optflags: ppc32dy4 -O2 -g -m32 | |
40 | -optflags: ppciseries -O2 -g -m32 | |
41 | -optflags: ppcpseries -O2 -g -m32 | |
42 | -optflags: ppc64 -O2 -g -m64 -mminimal-toc | |
43 | -optflags: ppciseries -O2 -g -m64 -mminimal-toc | |
44 | -optflags: ppcpseries -O2 -g -m64 -mminimal-toc | |
45 | - | |
46 | -optflags: parisc -O2 -g -mpa-risc-1-0 | |
47 | -optflags: hppa1.0 -O2 -g -mpa-risc-1-0 | |
48 | -optflags: hppa1.1 -O2 -g -mpa-risc-1-0 | |
49 | -optflags: hppa1.2 -O2 -g -mpa-risc-1-0 | |
50 | -optflags: hppa2.0 -O2 -g -mpa-risc-1-0 | |
51 | - | |
52 | -optflags: mips -O2 -g | |
53 | -optflags: mipsel -O2 -g | |
54 | - | |
55 | -optflags: armv3l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv3 | |
56 | -optflags: armv4b -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 | |
57 | -optflags: armv4l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 | |
58 | -optflags: armv5teb -O2 -g -fsigned-char -fomit-frame-pointer -march=armv5te | |
59 | -optflags: armv5tel -O2 -g -fsigned-char -fomit-frame-pointer -march=armv5te | |
60 | - | |
61 | -optflags: atarist -O2 -g -fomit-frame-pointer | |
62 | -optflags: atariste -O2 -g -fomit-frame-pointer | |
63 | -optflags: ataritt -O2 -g -fomit-frame-pointer | |
64 | -optflags: falcon -O2 -g -fomit-frame-pointer | |
65 | -optflags: atariclone -O2 -g -fomit-frame-pointer | |
66 | -optflags: milan -O2 -g -fomit-frame-pointer | |
67 | -optflags: hades -O2 -g -fomit-frame-pointer | |
68 | +optflags: i386 -O2 -fno-strict-aliasing -fwrapv -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}} | |
69 | +optflags: i486 -O2 -fno-strict-aliasing -fwrapv -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}} | |
70 | +optflags: i586 -O2 -fno-strict-aliasing -fwrapv -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}} | |
71 | +optflags: i686 -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}} | |
72 | +optflags: pentium3 -O2 -fno-strict-aliasing -fwrapv -march=pentium3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium3: %{specflags_pentium3}}} | |
73 | +optflags: pentium4 -O2 -fno-strict-aliasing -fwrapv -march=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium4: %{specflags_pentium4}}} | |
74 | +optflags: athlon -O2 -fno-strict-aliasing -fwrapv -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}} | |
75 | +optflags: ia64 -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}} | |
76 | +optflags: x86_64 -O2 -fno-strict-aliasing -fwrapv -march=x86-64%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}} | |
77 | +optflags: amd64 -O2 -fno-strict-aliasing -fwrapv -march=k8%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}} | |
78 | +optflags: ia32e -O2 -fno-strict-aliasing -fwrapv -march=nocona%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32e: %{specflags_ia32e}}} | |
79 | + | |
80 | +optflags: alpha -O2 -fno-strict-aliasing -fwrapv -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}} | |
81 | +optflags: alphaev5 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}} | |
82 | +optflags: alphaev56 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev56: %{specflags_alphaev56}}} | |
83 | +optflags: alphapca56 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=pca56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphapca56: %{specflags_alphapca56}}} | |
84 | +optflags: alphaev6 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev6%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev6: %{specflags_alphaev6}}} | |
85 | +optflags: alphaev67 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}} | |
86 | + | |
87 | +optflags: sparc -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=v7 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}} | |
88 | +optflags: sparcv8 -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=v8 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv8: %{specflags_sparcv8}}} | |
89 | +optflags: sparcv9 -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}} | |
90 | +optflags: sparc64 -O2 -fno-strict-aliasing -fwrapv -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}} | |
91 | + | |
92 | +optflags: m68k -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}} | |
93 | + | |
94 | +optflags: ppc -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} | |
95 | +optflags: ppc8260 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}} | |
96 | +optflags: ppc8560 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}} | |
97 | +optflags: ppc32dy4 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}} | |
98 | +optflags: ppciseries -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppciseries: %{specflags_ppciseries}}} | |
99 | +optflags: ppcpseries -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}} | |
100 | +optflags: ppc64 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc64: %{specflags_ppc64}}} | |
101 | + | |
102 | +optflags: parisc -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}} | |
103 | +optflags: hppa1.0 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}} | |
104 | +optflags: hppa1.1 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_1: %{specflags_hppa1_1}}} | |
105 | +optflags: hppa1.2 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_2: %{specflags_hppa1_2}}} | |
106 | +optflags: hppa2.0 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa2_0: %{specflags_hppa2_0}}} | |
107 | + | |
108 | +optflags: mips -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}} | |
109 | +optflags: mipsel -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}%{?specflags_mipsel: %{specflags_mipsel}}} | |
110 | + | |
111 | +optflags: armv3l -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv3l: %{specflags_armv3l}}} | |
112 | +optflags: armv4b -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4b: %{specflags_armv4b}}} | |
113 | +optflags: armv4l -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4l: %{specflags_armv4l}}} | |
114 | +optflags: armv5teb -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv5te%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv5teb: %{specflags_armv5teb}}} | |
115 | +optflags: armv5tel -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv5te%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv5tel: %{specflags_armv5tel}}} | |
116 | + | |
117 | +optflags: atarist -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atarist: %{specflags_atarist}}} | |
118 | +optflags: atariste -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariste: %{specflags_atariste}}} | |
119 | +optflags: ataritt -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ataritt: %{specflags_ataritt}}} | |
120 | +optflags: falcon -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_falcon: %{specflags_falcon}}} | |
121 | +optflags: atariclone -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}} | |
122 | +optflags: milan -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}} | |
123 | +optflags: hades -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}} | |
124 | ||
125 | -optflags: s390 -O2 -g -m31 | |
126 | -optflags: s390x -O2 -g -m64 | |
127 | +optflags: s390 -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}} | |
128 | +optflags: s390x -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}} | |
129 | ||
130 | ############################################################# | |
131 | # Canonical arch names and numbers | |
132 | @@ -418,7 +416,7 @@ | |
133 | buildarch_compat: amd64: x86_64 | |
134 | buildarch_compat: ia32e: x86_64 | |
135 | ||
136 | -macrofiles: @USRLIBRPM@/macros:@USRLIBRPM@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros | |
137 | +macrofiles: @USRLIBRPM@/macros:@USRLIBRPM@/macros.build:@USRLIBRPM@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros | |
138 | ||
139 | # \endverbatim | |
140 | #*/ |