From: Jakub Bogusz Date: Sun, 26 May 2013 18:36:57 +0000 (+0200) Subject: - updated to 5.1.2 X-Git-Tag: auto/th/gmp-5.1.2-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=74cdb5dd1ca7dab3cf88db9bb33394adee121db3;p=packages%2Fgmp.git - updated to 5.1.2 - updated cpu patch --- diff --git a/gmp-cpu.patch b/gmp-cpu.patch index abc5681..bd51a1b 100644 --- a/gmp-cpu.patch +++ b/gmp-cpu.patch @@ -1,6 +1,6 @@ ---- gmp-5.1.1/configure.ac.orig 2013-02-11 16:29:14.000000000 +0100 -+++ gmp-5.1.1/configure.ac 2013-02-12 21:08:17.609046451 +0100 -@@ -247,8 +247,12 @@ +--- gmp-5.1.2/configure.ac.orig 2013-05-20 16:59:56.000000000 +0200 ++++ gmp-5.1.2/configure.ac 2013-05-26 18:44:03.674054550 +0200 +@@ -252,8 +252,12 @@ AC_MSG_ERROR([when doing a fat build, disabling assembly will not work]) fi @@ -15,7 +15,7 @@ AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_$tmp_host) GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST) -@@ -431,7 +435,7 @@ +@@ -436,7 +440,7 @@ alpha*-*-*) AC_DEFINE(HAVE_HOST_CPU_FAMILY_alpha) @@ -24,7 +24,7 @@ alphaev5* | alphapca5*) path="alpha/ev5 alpha" ;; alphaev67 | alphaev68 | alphaev7*) -@@ -455,7 +459,7 @@ +@@ -460,7 +464,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" ;; -@@ -488,7 +492,7 @@ +@@ -493,7 +497,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" ;; -@@ -523,7 +527,7 @@ +@@ -528,7 +532,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" ;; -@@ -640,7 +644,7 @@ +@@ -649,7 +653,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) -@@ -658,13 +662,13 @@ +@@ -667,13 +671,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" ;; -@@ -731,7 +735,7 @@ +@@ -740,7 +744,7 @@ SPEED_CYCLECOUNTER_OBJ=ia64.lo any_32_testlist="sizeof-long-4" @@ -85,7 +85,7 @@ itanium) path="ia64/itanium ia64" ;; itanium2) path="ia64/itanium2 ia64" ;; *) path="ia64" ;; -@@ -741,7 +745,7 @@ +@@ -750,7 +754,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 -@@ -803,7 +807,7 @@ +@@ -812,7 +816,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" ;; -@@ -815,7 +819,7 @@ +@@ -824,7 +828,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 -@@ -922,7 +926,7 @@ +@@ -931,7 +935,7 @@ SPEED_CYCLECOUNTER_OBJ=powerpc.lo cyclecounter_size=0 @@ -121,7 +121,7 @@ powerpc740 | powerpc750) path="powerpc32/750 powerpc32" ;; powerpc7400 | powerpc7410) -@@ -933,7 +937,7 @@ +@@ -942,7 +946,7 @@ path="powerpc32" ;; esac @@ -130,7 +130,7 @@ powerpc401) gcc_cflags_cpu="-mcpu=401" ;; powerpc403) gcc_cflags_cpu="-mcpu=403" xlc_cflags_arch="-qarch=403 -qarch=ppc" ;; -@@ -1251,7 +1255,7 @@ +@@ -1260,7 +1264,7 @@ any_testlist="sizeof-long-4" GMP_INCLUDE_MPN(sparc32/sparc-defs.m4) @@ -139,16 +139,16 @@ sparcv8 | microsparc | turbosparc) path="sparc32/v8 sparc32" ;; supersparc) -@@ -1278,7 +1282,7 @@ +@@ -1287,7 +1291,7 @@ # latter would be used in the 64-bit ABI on systems like "*bsd" where # abilist="64" only. # - case $host_cpu in + case $gmp_cpu in + [ultrasparct[345]]) + gcc_32_cflags="$gcc_cflags -Wa,-xarch=v8plusd" ;; sparc64 | sparcv9* | ultrasparc*) - gcc_32_cflags="$gcc_cflags -Wa,-xarch=v8plus" ;; - esac -@@ -1294,7 +1298,7 @@ +@@ -1305,7 +1309,7 @@ # gcc 3.2 adds nothing. # gcc 3.3 adds ultrasparc3. # @@ -157,7 +157,7 @@ supersparc) gcc_cflags_cpu="-mcpu=supersparc -msupersparc" ;; sparcv8 | microsparc | turbosparc) gcc_cflags_cpu="-mcpu=v8 -mv8" ;; -@@ -1316,7 +1320,7 @@ +@@ -1327,7 +1331,7 @@ # SunOS cc doesn't know -xarch, apparently always generating v7 # code, so make this optional @@ -165,8 +165,8 @@ + case $gmp_cpu in sparcv8 | microsparc | supersparc | turbosparc) cc_cflags_arch="-xarch=v8" ;; - sparc64 | sparcv9* | ultrasparc*) cc_cflags_arch="-xarch=v8plus" ;; -@@ -1331,7 +1335,7 @@ + [ultrasparct[345]]) cc_cflags_arch="-xarch=v8plusd" ;; +@@ -1343,7 +1347,7 @@ # FIXME: Which of ultra, ultra2 or ultra2i is the best fallback for # ultrasparc3? # @@ -175,7 +175,7 @@ supersparc) cc_cflags_cpu="-xchip=super" ;; microsparc) cc_cflags_cpu="-xchip=micro" ;; turbosparc) cc_cflags_cpu="-xchip=micro2" ;; -@@ -1343,7 +1347,7 @@ +@@ -1355,7 +1359,7 @@ esac esac @@ -184,7 +184,7 @@ sparc64 | sparcv9* | ultrasparc*) case $host in # Solaris 6 and earlier cannot run ABI=64 since it doesn't save -@@ -1370,7 +1374,7 @@ +@@ -1382,7 +1386,7 @@ *) abilist="64 32" ;; esac @@ -193,7 +193,7 @@ ultrasparc | ultrasparc2 | ultrasparc2i) path_64="sparc64/ultrasparc1234 sparc64" ;; [ultrasparc[34]]) -@@ -1505,7 +1509,7 @@ +@@ -1517,7 +1521,7 @@ # duplicate anything. # gcc_cflags_optlist="cpu arch" diff --git a/gmp.spec b/gmp.spec index 09995fa..3d35724 100644 --- a/gmp.spec +++ b/gmp.spec @@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8): Biblioteca de precisão arbitrária da GNU Summary(uk.UTF-8): Бібліотека GNU довільної точності Summary(ru.UTF-8): Библиотека GNU произвольной точности Name: gmp -Version: 5.1.1 +Version: 5.1.2 Release: 1 License: LGPL v3+ Group: Libraries Source0: http://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.xz -# Source0-md5: 485b1296e6287fa381e6015b19767989 +# Source0-md5: 06fe2ca164221c59ce74867155cfc1ac Patch0: %{name}-info.patch Patch1: %{name}-multilib.patch Patch2: %{name}-cpu.patch