packages: gmp/gmp-cpu.patch, gmp/gmp-multilib.patch, gmp/gmp.spec - updated...
qboosh
qboosh at pld-linux.org
Sat Mar 27 14:59:57 CET 2010
Author: qboosh Date: Sat Mar 27 13:59:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.0.1
- updated multilib,cpu patches
---- Files affected:
packages/gmp:
gmp-cpu.patch (1.1 -> 1.2) , gmp-multilib.patch (1.1 -> 1.2) , gmp.spec (1.110 -> 1.111)
---- Diffs:
================================================================
Index: packages/gmp/gmp-cpu.patch
diff -u packages/gmp/gmp-cpu.patch:1.1 packages/gmp/gmp-cpu.patch:1.2
--- packages/gmp/gmp-cpu.patch:1.1 Sat Oct 3 09:20:03 2009
+++ packages/gmp/gmp-cpu.patch Sat Mar 27 14:59:51 2010
@@ -1,6 +1,6 @@
---- gmp-4.3.1/configure.in.orig 2009-05-12 08:12:12.000000000 +0200
-+++ gmp-4.3.1/configure.in 2009-10-03 08:32:51.312616803 +0200
-@@ -229,9 +229,12 @@
+--- gmp-5.0.1/configure.in.orig 2010-02-06 13:43:13.000000000 +0100
++++ gmp-5.0.1/configure.in 2010-03-27 06:34:00.378711083 +0100
+@@ -243,9 +243,12 @@
esac],
[enable_minithres=no])
@@ -15,16 +15,16 @@
AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_$tmp_host)
GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST)
-@@ -405,7 +408,7 @@
+@@ -420,7 +423,7 @@
alpha*-*-*)
AC_DEFINE(HAVE_HOST_CPU_FAMILY_alpha)
- case $host_cpu in
+ case $gmp_cpu in
- alphaev5* | alphapca5*) path="alpha/ev5 alpha" ;;
+ alphaev5* | alphapca5*)
+ path="alpha/ev5 alpha" ;;
alphaev67 | alphaev68 | alphaev7*)
- path="alpha/ev67 alpha/ev6 alpha/ev5 alpha" ;;
-@@ -426,7 +429,7 @@
+@@ -444,7 +447,7 @@
# compiler errors too easily and is rejected by GMP_PROG_CC_WORKS. Each
# -mcpu=ev6 below has a fallback to -mcpu=ev56 for this reason.
#
@@ -33,7 +33,7 @@
alpha) gcc_cflags_cpu="-mcpu=ev4" ;;
alphaev5) gcc_cflags_cpu="-mcpu=ev5" ;;
alphaev56) gcc_cflags_cpu="-mcpu=ev56" ;;
-@@ -459,7 +462,7 @@
+@@ -477,7 +480,7 @@
# Insns like ctlz which were never available as macros are always
# accepted and always generate their plain code.
#
@@ -42,7 +42,7 @@
alpha) gcc_cflags_asm="-Wa,-arch,ev4 -Wa,-mev4" ;;
alphaev5) gcc_cflags_asm="-Wa,-arch,ev5 -Wa,-mev5" ;;
alphaev56) gcc_cflags_asm="-Wa,-arch,ev56 -Wa,-mev56" ;;
-@@ -494,7 +497,7 @@
+@@ -512,7 +515,7 @@
# DEC C V5.9-005 knows ev4, ev5, ev56, pca56, ev6.
# Compaq C V6.3-029 adds ev67.
#
@@ -51,7 +51,7 @@
alpha) cc_cflags_cpu="-arch~ev4~-tune~ev4" ;;
alphaev5) cc_cflags_cpu="-arch~ev5~-tune~ev5" ;;
alphaev56) cc_cflags_cpu="-arch~ev56~-tune~ev56" ;;
-@@ -578,7 +581,7 @@
+@@ -595,7 +598,7 @@
# (Can't remember why this isn't done already, have to check what .asm
# files are available in each and how they run on a typical 2.0 cpu.)
#
@@ -60,7 +60,7 @@
hppa1.0*) path="pa32" ;;
hppa7000*) path="pa32/hppa1_1 pa32" ;;
hppa2.0* | hppa64)
-@@ -596,13 +599,13 @@
+@@ -613,13 +616,13 @@
# probably be safe, but let's not take the chance. In any case, a
# configuration like --host=hppa2.0 ABI=1.0 is far from optimal.
#
@@ -76,7 +76,7 @@
hppa1.0*) cc_cflags="+O2" ;;
*) # default to 7100
cc_cflags="+DA1.1 +O2" ;;
-@@ -667,7 +670,7 @@
+@@ -684,7 +687,7 @@
GMP_INCLUDE_MPN(ia64/ia64-defs.m4)
SPEED_CYCLECOUNTER_OBJ=ia64.lo
@@ -85,7 +85,7 @@
itanium) path="ia64/itanium ia64" ;;
itanium2) path="ia64/itanium2 ia64" ;;
*) path="ia64" ;;
-@@ -677,7 +680,7 @@
+@@ -694,7 +697,7 @@
gcc_32_cflags_optlist=$gcc_64_cflags_optlist
# gcc pre-release 3.4 adds -mtune itanium and itanium2
@@ -94,7 +94,7 @@
itanium) gcc_cflags_tune="-mtune=itanium" ;;
itanium2) gcc_cflags_tune="-mtune=itanium2" ;;
esac
-@@ -738,7 +741,7 @@
+@@ -755,7 +758,7 @@
# gcc 2.95 adds -mcpu32, -m68060.
# FIXME: Maybe "-m68020 -mnobitfield" would suit cpu32 on 2.7.2.
#
@@ -103,7 +103,7 @@
m68020) gcc_cflags_arch="-m68020" ;;
m68030) gcc_cflags_arch="-m68030" ;;
m68040) gcc_cflags_arch="-m68040" ;;
-@@ -750,7 +753,7 @@
+@@ -767,7 +770,7 @@
# FIXME: m68k/mc68020 looks like it's ok for cpu32, but this wants to be
# tested. Will need to introduce an m68k/cpu32 if m68k/mc68020 ever uses
# the bitfield instructions.
@@ -112,7 +112,7 @@
[m680[234]0 | m68360]) path="m68k/mc68020 m68k" ;;
*) path="m68k" ;;
esac
-@@ -856,7 +859,7 @@
+@@ -874,7 +877,7 @@
SPEED_CYCLECOUNTER_OBJ=powerpc.lo
cyclecounter_size=0
@@ -121,7 +121,7 @@
powerpc740 | powerpc750)
path="powerpc32/750 powerpc32" ;;
powerpc7400 | powerpc7410)
-@@ -880,7 +883,7 @@
+@@ -898,7 +901,7 @@
# done for all the others too. But what would be the correct
# arrangements?
#
@@ -130,7 +130,7 @@
powerpc401) gcc_cflags_cpu="-mcpu=401" ;;
powerpc403) gcc_cflags_cpu="-mcpu=403" ;;
powerpc405) gcc_cflags_cpu="-mcpu=405" ;;
-@@ -919,7 +922,7 @@
+@@ -946,7 +949,7 @@
# -qarch=ppc is needed, so ensure everything falls back to that.
# FIXME: Perhaps newer versions know more flavours.
#
@@ -139,16 +139,7 @@
powerpc403) xlc_cflags_arch="-qarch=403 -qarch=ppc" ;;
powerpc601) xlc_cflags_arch="-qarch=601 -qarch=ppc" ;;
powerpc602) xlc_cflags_arch="-qarch=602 -qarch=ppc" ;;
-@@ -934,7 +937,7 @@
-
- case $host in
- POWERPC64_PATTERN)
-- case $host_cpu in
-+ case $gmp_cpu in
- powerpc970) vmx_path="powerpc64/vmx" ;;
- *) vmx_path="" ;;
- esac
-@@ -1092,7 +1095,7 @@
+@@ -1121,7 +1124,7 @@
any_testlist="sizeof-long-4"
GMP_INCLUDE_MPN(sparc32/sparc-defs.m4)
@@ -157,7 +148,7 @@
sparcv8 | microsparc | turbosparc)
path="sparc32/v8 sparc32" ;;
supersparc)
-@@ -1117,7 +1120,7 @@
+@@ -1146,7 +1149,7 @@
# latter would be used in the 64-bit ABI on systems like "*bsd" where
# abilist="64" only.
#
@@ -166,7 +157,7 @@
sparc64 | sparcv9* | ultrasparc*)
gcc_cflags="$gcc_cflags -Wa,-xarch=v8plus" ;;
*)
-@@ -1135,7 +1138,7 @@
+@@ -1164,7 +1167,7 @@
# gcc 3.2 adds nothing.
# gcc 3.3 adds ultrasparc3.
#
@@ -175,7 +166,7 @@
supersparc) gcc_cflags_cpu="-mcpu=supersparc -msupersparc" ;;
sparcv8 | microsparc | turbosparc)
gcc_cflags_cpu="-mcpu=v8 -mv8" ;;
-@@ -1157,7 +1160,7 @@
+@@ -1186,7 +1189,7 @@
# SunOS cc doesn't know -xarch, apparently always generating v7
# code, so make this optional
@@ -184,7 +175,7 @@
sparcv8 | microsparc | supersparc | turbosparc)
cc_cflags_arch="-xarch=v8" ;;
sparc64 | sparcv9* | ultrasparc*) cc_cflags_arch="-xarch=v8plus" ;;
-@@ -1172,7 +1175,7 @@
+@@ -1201,7 +1204,7 @@
# FIXME: Which of ultra, ultra2 or ultra2i is the best fallback for
# ultrasparc3?
#
@@ -193,7 +184,7 @@
supersparc) cc_cflags_cpu="-xchip=super" ;;
microsparc) cc_cflags_cpu="-xchip=micro" ;;
turbosparc) cc_cflags_cpu="-xchip=micro2" ;;
-@@ -1184,7 +1187,7 @@
+@@ -1213,7 +1216,7 @@
esac
esac
@@ -202,7 +193,16 @@
sparc64 | sparcv9* | ultrasparc*)
case $host in
# Solaris 6 and earlier cannot run ABI=64 since it doesn't save
-@@ -1330,7 +1333,7 @@
+@@ -1240,7 +1243,7 @@
+ *) abilist="64 32" ;;
+ esac
+
+- case $host_cpu in
++ case $gmp_cpu in
+ ultrasparc | ultrasparc2 | ultrasparc2i)
+ path_64="sparc64/ultrasparc12 sparc64" ;;
+ ultrasparc3)
+@@ -1367,7 +1370,7 @@
# duplicate anything.
#
gcc_cflags_optlist="cpu arch"
@@ -211,7 +211,7 @@
i386*)
gcc_cflags_cpu="-mtune=i386 -mcpu=i386 -m386"
gcc_cflags_arch="-march=i386"
-@@ -1415,7 +1418,7 @@
+@@ -1457,7 +1460,7 @@
;;
esac
@@ -220,21 +220,12 @@
i386*) path="x86" ;;
i486*) path="x86/i486 x86" ;;
i586 | pentium) path="x86/pentium x86" ;;
-@@ -1458,7 +1461,7 @@
- SQR_KARATSUBA_THRESHOLD SQR_TOOM3_THRESHOLD"
- fi
-
-- case $host_cpu in
-+ case $gmp_cpu in
- athlon64 | atom | core2 | pentium4 | x86_64)
- cclist_64="gcc"
- gcc_64_cflags="$gcc_64_cflags -m64"
-@@ -1475,7 +1478,7 @@
- ;;
- esac
+@@ -1492,7 +1495,7 @@
+ abilist="64 32"
+ path_64="x86_64"
- case $host_cpu in
+ case $gmp_cpu in
- athlon64 | x86_64)
- abilist="64 32"
- path_64="x86_64"
+ x86_64)
+ ;;
+ athlon64)
================================================================
Index: packages/gmp/gmp-multilib.patch
diff -u packages/gmp/gmp-multilib.patch:1.1 packages/gmp/gmp-multilib.patch:1.2
--- packages/gmp/gmp-multilib.patch:1.1 Fri Dec 29 04:22:36 2006
+++ packages/gmp/gmp-multilib.patch Sat Mar 27 14:59:51 2010
@@ -1,21 +1,14 @@
---- gmp-4.2.1/gmp-h.in.orig 2006-04-11 18:10:15.000000000 +0000
-+++ gmp-4.2.1/gmp-h.in 2006-12-29 02:17:26.000000000 +0000
-@@ -29,10 +29,18 @@
-
- /* Instantiated by configure. */
+--- gmp-5.0.1/gmp-h.in.orig 2010-02-06 13:43:13.000000000 +0100
++++ gmp-5.0.1/gmp-h.in 2010-03-26 08:29:16.966713597 +0100
+@@ -30,7 +30,12 @@
#if ! defined (__GMP_WITHIN_CONFIGURE)
--#define __GMP_BITS_PER_MP_LIMB @BITS_PER_MP_LIMB@
-+/* ugly hack: limb size differs depending on ABI */
-+#if defined(__arch64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)
-+#define __GMP_BITS_PER_MP_LIMB 64
#define __GMP_HAVE_HOST_CPU_FAMILY_power @HAVE_HOST_CPU_FAMILY_power@
#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc @HAVE_HOST_CPU_FAMILY_powerpc@
--#define GMP_LIMB_BITS @BITS_PER_MP_LIMB@
+-#define GMP_LIMB_BITS @GMP_LIMB_BITS@
++/* ugly hack: limb size differs depending on ABI */
++#if defined(__arch64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)
+#define GMP_LIMB_BITS 64
+#else
-+#define __GMP_BITS_PER_MP_LIMB 32
-+#define __GMP_HAVE_HOST_CPU_FAMILY_power @HAVE_HOST_CPU_FAMILY_power@
-+#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc @HAVE_HOST_CPU_FAMILY_powerpc@
+#define GMP_LIMB_BITS 32
+#endif
#define GMP_NAIL_BITS @GMP_NAIL_BITS@
================================================================
Index: packages/gmp/gmp.spec
diff -u packages/gmp/gmp.spec:1.110 packages/gmp/gmp.spec:1.111
--- packages/gmp/gmp.spec:1.110 Thu Jan 21 18:54:29 2010
+++ packages/gmp/gmp.spec Sat Mar 27 14:59:52 2010
@@ -13,12 +13,12 @@
Summary(uk.UTF-8): Бібліотека GNU довільної точності
Summary(ru.UTF-8): Библиотека GNU произвольной точности
Name: gmp
-Version: 4.3.2
+Version: 5.0.1
Release: 1
License: LGPL v3+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.bz2
-# Source0-md5: dd60683d7057917e34630b4a787932e8
+# Source0-md5: 6bac6df75c192a13419dfd71d19240a7
Patch0: %{name}-info.patch
Patch1: %{name}-multilib.patch
Patch2: %{name}-cpu.patch
@@ -301,7 +301,7 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_libdir}/libgmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgmp.so.3
+%attr(755,root,root) %ghost %{_libdir}/libgmp.so.10
%files devel
%defattr(644,root,root,755)
@@ -351,6 +351,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.111 2010/03/27 13:59:52 qboosh
+- updated to 5.0.1
+- updated multilib,cpu patches
+
Revision 1.110 2010/01/21 17:54:29 pluto
- updated to 4.3.2.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmp/gmp-cpu.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmp/gmp-multilib.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmp/gmp.spec?r1=1.110&r2=1.111&f=u
More information about the pld-cvs-commit
mailing list