1 |
vapier 09/04/27 06:46:22 |
2 |
|
3 |
Added: gmp-4.3.0-ABI-multilib.patch |
4 |
Log: |
5 |
Version bump #266445 by Gabriel Máculus. |
6 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-libs/gmp/files/gmp-4.3.0-ABI-multilib.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/gmp/files/gmp-4.3.0-ABI-multilib.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/gmp/files/gmp-4.3.0-ABI-multilib.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gmp-4.3.0-ABI-multilib.patch |
15 |
=================================================================== |
16 |
Gentoo uses ABI env var already |
17 |
|
18 |
--- gmp-4.2.3/configure |
19 |
+++ gmp-4.2.3/configure |
20 |
@@ -489,7 +489,7 @@ |
21 |
# include <unistd.h> |
22 |
#endif" |
23 |
|
24 |
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUI |
25 |
LD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' |
26 |
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_ |
27 |
BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' |
28 |
ac_subst_files='' |
29 |
|
30 |
# Initialize some variables set by options. |
31 |
@@ -930,10 +930,10 @@ |
32 |
ac_env_target_alias_value=$target_alias |
33 |
ac_cv_env_target_alias_set=${target_alias+set} |
34 |
ac_cv_env_target_alias_value=$target_alias |
35 |
-ac_env_ABI_set=${ABI+set} |
36 |
-ac_env_ABI_value=$ABI |
37 |
-ac_cv_env_ABI_set=${ABI+set} |
38 |
-ac_cv_env_ABI_value=$ABI |
39 |
+ac_env_GMPABI_set=${GMPABI+set} |
40 |
+ac_env_GMPABI_value=$GMPABI |
41 |
+ac_cv_env_GMPABI_set=${GMPABI+set} |
42 |
+ac_cv_env_GMPABI_value=$GMPABI |
43 |
ac_env_CC_set=${CC+set} |
44 |
ac_env_CC_value=$CC |
45 |
ac_cv_env_CC_set=${CC+set} |
46 |
@@ -1091,7 +1091,7 @@ |
47 |
include additional configurations [automatic] |
48 |
|
49 |
Some influential environment variables: |
50 |
- ABI desired ABI (for processors supporting more than one ABI) |
51 |
+ GMPABI desired ABI (for processors supporting more than one ABI) |
52 |
CC C compiler command |
53 |
CFLAGS C compiler flags |
54 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
55 |
@@ -2670,7 +2670,7 @@ |
56 |
# (64-bit), but not both, so there's no option to choose the desired |
57 |
# mode, we must instead detect which of the two it is. This is done by |
58 |
# checking sizeof(long), either 4 or 8 bytes respectively. Do this in |
59 |
- # ABI=1.0 too, in case someone tries to build that with a 2.0w gcc. |
60 |
+ # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc. |
61 |
# |
62 |
gcc_cflags="-O2" |
63 |
gcc_cflags_optlist="arch" |
64 |
@@ -2694,11 +2694,11 @@ |
65 |
# gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1 |
66 |
# gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0 |
67 |
# |
68 |
- # We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not |
69 |
+ # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not |
70 |
# be saved by the kernel on an old system. Actually gcc (as of 3.2) |
71 |
# only adds a few float instructions with -mpa-risc-2-0, so it would |
72 |
# probably be safe, but let's not take the chance. In any case, a |
73 |
- # configuration like --host=hppa2.0 ABI=1.0 is far from optimal. |
74 |
+ # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal. |
75 |
# |
76 |
case $host_cpu in |
77 |
hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;; |
78 |
@@ -2733,9 +2733,9 @@ |
79 |
cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings" |
80 |
cc_20n_testlist="hpc-hppa-2-0" |
81 |
|
82 |
- # ABI=2.0w is available for hppa2.0w and hppa2.0, but not for |
83 |
+ # GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for |
84 |
# hppa2.0n, on the assumption that that the latter indicates a |
85 |
- # desire for ABI=2.0n. |
86 |
+ # desire for GMPABI=2.0n. |
87 |
case $host in |
88 |
hppa2.0n-*-*) ;; |
89 |
*) |
90 |
@@ -3203,7 +3203,7 @@ |
91 |
# mode, but not set our ABI. For some reason it's sparc where this |
92 |
# keeps coming up, presumably users there are accustomed to driving the |
93 |
# compiler mode that way. The effect of our testlist setting is to |
94 |
- # reject ABI=64 in favour of ABI=32 if the user has forced the flags to |
95 |
+ # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to |
96 |
# 32-bit mode. |
97 |
# |
98 |
abilist="32" |
99 |
@@ -3308,12 +3308,12 @@ |
100 |
case $host_cpu in |
101 |
sparc64 | sparcv9* | ultrasparc*) |
102 |
case $host in |
103 |
- # Solaris 6 and earlier cannot run ABI=64 since it doesn't save |
104 |
- # registers properly, so ABI=32 is left as the only choice. |
105 |
+ # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save |
106 |
+ # registers properly, so GMPABI=32 is left as the only choice. |
107 |
# |
108 |
*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;; |
109 |
|
110 |
- # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only |
111 |
+ # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only |
112 |
# choice. In fact they need no special compiler flags, gcc -m64 |
113 |
# is the default, but it doesn't hurt to add it. v9 CPUs always |
114 |
# use the sparc64 port, since the plain 32-bit sparc ports don't |
115 |
@@ -3399,7 +3399,7 @@ |
116 |
# -O, but lets assume that's no longer true. |
117 |
# |
118 |
# -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is |
119 |
- # the default in such a build (we think), so -m32 is essential for ABI=32. |
120 |
+ # the default in such a build (we think), so -m32 is essential for GMPABI=32. |
121 |
# This is, of course, done for any $host_cpu, not just x86_64, so we can |
122 |
# get such a gcc into the right mode to cross-compile to say i486-*-*. |
123 |
# |
124 |
@@ -3639,7 +3639,7 @@ |
125 |
|
126 |
cat >&5 <<EOF |
127 |
User: |
128 |
-ABI=$ABI |
129 |
+GMPABI=$GMPABI |
130 |
CC=$CC |
131 |
CFLAGS=$CFLAGS_or_unset |
132 |
CPPFLAGS=$CPPFLAGS_or_unset |
133 |
@@ -3660,24 +3660,24 @@ |
134 |
# If the user specifies an ABI then it must be in $abilist, after that |
135 |
# $abilist is restricted to just that choice. |
136 |
# |
137 |
-if test -n "$ABI"; then |
138 |
+if test -n "$GMPABI"; then |
139 |
found=no |
140 |
for abi in $abilist; do |
141 |
- if test $abi = "$ABI"; then found=yes; break; fi |
142 |
+ if test $abi = "$GMPABI"; then found=yes; break; fi |
143 |
done |
144 |
if test $found = no; then |
145 |
- { { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5 |
146 |
-echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;} |
147 |
+ { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5 |
148 |
+echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;} |
149 |
{ (exit 1); exit 1; }; } |
150 |
fi |
151 |
- abilist="$ABI" |
152 |
+ abilist="$GMPABI" |
153 |
fi |
154 |
|
155 |
found_compiler=no |
156 |
|
157 |
for abi in $abilist; do |
158 |
|
159 |
- echo "checking ABI=$abi" |
160 |
+ echo "checking GMPABI=$abi" |
161 |
|
162 |
# Suppose abilist="64 32", then for abi=64, will have abi1="_64" and |
163 |
# abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how |
164 |
@@ -5128,7 +5128,7 @@ |
165 |
# For -march settings which enable SSE2 we exclude certain bad |
166 |
# gcc versions and we need an OS knowing how to save xmm regs. |
167 |
# |
168 |
- # This is only for ABI=32, any 64-bit gcc is good and any OS |
169 |
+ # This is only for GMPABI=32, any 64-bit gcc is good and any OS |
170 |
# knowing x86_64 will know xmm. |
171 |
# |
172 |
# -march=k8 was only introduced in gcc 3.3, so we shouldn't need |
173 |
@@ -6368,16 +6368,16 @@ |
174 |
done |
175 |
fi |
176 |
|
177 |
- ABI="$abi" |
178 |
+ GMPABI="$abi" |
179 |
CC="$cc" |
180 |
CFLAGS="$cflags" |
181 |
CPPFLAGS="$cppflags" |
182 |
|
183 |
|
184 |
# Could easily have this in config.h too, if desired. |
185 |
- ABI_nodots=`echo $ABI | sed 's/\./_/'` |
186 |
+ GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'` |
187 |
|
188 |
-echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p |
189 |
+echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p |
190 |
|
191 |
|
192 |
|
193 |
@@ -8830,12 +8830,12 @@ |
194 |
# If there's any sse2 or mmx in the path, check whether the assembler |
195 |
# supports it, and remove if not. |
196 |
# |
197 |
-# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new |
198 |
+# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new |
199 |
# enough assembler. |
200 |
# |
201 |
case $host in |
202 |
i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | athlon64-*-* | atom-*-* | core2-*-* | x86_64-*-*) |
203 |
- if test "$ABI" = 32; then |
204 |
+ if test "$GMPABI" = 32; then |
205 |
case "$path $fat_path" in |
206 |
*mmx*) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5 |
207 |
echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6 |
208 |
@@ -9019,7 +9019,7 @@ |
209 |
|
210 |
cat >&5 <<EOF |
211 |
Decided: |
212 |
-ABI=$ABI |
213 |
+GMPABI=$GMPABI |
214 |
CC=$CC |
215 |
CFLAGS=$CFLAGS |
216 |
CPPFLAGS=$CPPFLAGS |
217 |
@@ -9028,7 +9028,7 @@ |
218 |
CXXFLAGS=$CXXFLAGS |
219 |
path=$path |
220 |
EOF |
221 |
-echo "using ABI=\"$ABI\"" |
222 |
+echo "using GMPABI=\"$GMPABI\"" |
223 |
echo " CC=\"$CC\"" |
224 |
echo " CFLAGS=\"$CFLAGS\"" |
225 |
echo " CPPFLAGS=\"$CPPFLAGS\"" |
226 |
@@ -30005,7 +30005,7 @@ |
227 |
|
228 |
case $host in |
229 |
*-*-aix*) |
230 |
- case $ABI in |
231 |
+ case $GMPABI in |
232 |
64 | aix64) |
233 |
echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i |
234 |
;; |
235 |
@@ -30015,7 +30015,7 @@ |
236 |
esac |
237 |
;; |
238 |
*-*-linux* | *-*-*bsd*) |
239 |
- case $ABI in |
240 |
+ case $GMPABI in |
241 |
mode64) |
242 |
echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i |
243 |
;; |
244 |
@@ -30025,7 +30025,7 @@ |
245 |
esac |
246 |
;; |
247 |
*-*-darwin*) |
248 |
- case $ABI in |
249 |
+ case $GMPABI in |
250 |
mode64) |
251 |
echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i |
252 |
;; |
253 |
@@ -30048,7 +30048,7 @@ |
254 |
|
255 |
;; |
256 |
sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) |
257 |
- case $ABI in |
258 |
+ case $GMPABI in |
259 |
64) |
260 |
|
261 |
echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5 |
262 |
@@ -30130,7 +30130,7 @@ |
263 |
echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4 |
264 |
|
265 |
|
266 |
- case $ABI in |
267 |
+ case $GMPABI in |
268 |
32) |
269 |
|
270 |
echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i |
271 |
@@ -34032,7 +34032,7 @@ |
272 |
s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t |
273 |
s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t |
274 |
s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t |
275 |
-s,@ABI@,$ABI,;t t |
276 |
+s,@GMPABI@,$GMPABI,;t t |
277 |
s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t |
278 |
s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t |
279 |
s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t |