From: Jakub Bogusz Date: Wed, 13 Feb 2013 19:33:07 +0000 (+0100) Subject: - updated to 5.1.1 X-Git-Tag: auto/th/gmp-5.1.1-1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=cc591e0e40bbf73990aa61089db9d64534a81ba8;hp=f89f5e80968ec59a6d887021598229ed97b1de3d;p=packages%2Fgmp.git - updated to 5.1.1 - updated cpu,tinfo patches - removed obsolete am patch - BSD-compatibility library (libmp) has been dropped upstream; see gmp-bsd.spec instead --- diff --git a/gmp-am.patch b/gmp-am.patch deleted file mode 100644 index 2f0ea97..0000000 --- a/gmp-am.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- gmp-5.0.5/configure.in.orig 2012-05-09 18:42:22.071302791 +0200 -+++ gmp-5.0.5/configure.in 2012-05-09 18:43:35.227967934 +0200 -@@ -65,7 +65,7 @@ - dnl Note that there's a copy of these options in the top-level Makefile.am, - dnl so update there too if changing anything. - dnl --AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr]) -+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) - AM_CONFIG_HEADER(config.h:config.in) - AM_MAINTAINER_MODE - -@@ -2231,9 +2231,6 @@ - echo " MPN_PATH=\"$path\"" - - --# Automake ansi2knr support. --AM_C_PROTOTYPES -- - CL_AS_NOEXECSTACK - - GMP_PROG_AR ---- gmp-5.0.5/Makefile.am.orig 2012-05-06 13:19:49.000000000 +0200 -+++ gmp-5.0.5/Makefile.am 2012-05-09 18:49:43.637960258 +0200 -@@ -25,7 +25,7 @@ - # Makefiles in subdirectories, but here we must omit it so automake gives - # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr". - # --AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr -+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies - - - # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the diff --git a/gmp-cpu.patch b/gmp-cpu.patch index 2fe1c77..abc5681 100644 --- a/gmp-cpu.patch +++ b/gmp-cpu.patch @@ -1,21 +1,21 @@ ---- gmp-5.0.3/configure.in.orig 2012-01-27 09:59:30.000000000 +0100 -+++ gmp-5.0.3/configure.in 2012-01-30 18:23:57.260672021 +0100 -@@ -243,9 +243,12 @@ - esac], - [enable_minithres=no]) +--- 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 @@ + AC_MSG_ERROR([when doing a fat build, disabling assembly will not work]) + fi +- +-tmp_host=`echo $host_cpu | sed 's/\./_/'` +AC_ARG_WITH(cpu, +AC_HELP_STRING([--with-cpu], + [specify CPU type [[default=host_cpu]]]), +[gmp_cpu=$withval], [gmp_cpu=$host_cpu]) - -- --tmp_host=`echo $host_cpu | sed 's/\./_/'` ++ +tmp_host=`echo $gmp_cpu | sed 's/\./_/'` AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_$tmp_host) GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST) -@@ -428,7 +431,7 @@ +@@ -431,7 +435,7 @@ alpha*-*-*) AC_DEFINE(HAVE_HOST_CPU_FAMILY_alpha) @@ -24,7 +24,7 @@ alphaev5* | alphapca5*) path="alpha/ev5 alpha" ;; alphaev67 | alphaev68 | alphaev7*) -@@ -452,7 +455,7 @@ +@@ -455,7 +459,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" ;; -@@ -485,7 +488,7 @@ +@@ -488,7 +492,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" ;; -@@ -520,7 +523,7 @@ +@@ -523,7 +527,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" ;; -@@ -603,7 +606,7 @@ +@@ -640,7 +644,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) -@@ -621,13 +624,13 @@ +@@ -658,13 +662,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,16 +76,16 @@ hppa1.0*) cc_cflags="+O2" ;; *) # default to 7100 cc_cflags="+DA1.1 +O2" ;; -@@ -693,7 +696,7 @@ - GMP_INCLUDE_MPN(ia64/ia64-defs.m4) +@@ -731,7 +735,7 @@ SPEED_CYCLECOUNTER_OBJ=ia64.lo + any_32_testlist="sizeof-long-4" - case $host_cpu in + case $gmp_cpu in itanium) path="ia64/itanium ia64" ;; itanium2) path="ia64/itanium2 ia64" ;; *) path="ia64" ;; -@@ -703,7 +706,7 @@ +@@ -741,7 +745,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 -@@ -764,7 +767,7 @@ +@@ -803,7 +807,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" ;; -@@ -776,7 +779,7 @@ +@@ -815,7 +819,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 -@@ -883,7 +886,7 @@ +@@ -922,7 +926,7 @@ SPEED_CYCLECOUNTER_OBJ=powerpc.lo cyclecounter_size=0 @@ -121,7 +121,7 @@ powerpc740 | powerpc750) path="powerpc32/750 powerpc32" ;; powerpc7400 | powerpc7410) -@@ -894,7 +897,7 @@ +@@ -933,7 +937,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" ;; -@@ -1188,7 +1191,7 @@ +@@ -1251,7 +1255,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) -@@ -1213,7 +1216,7 @@ +@@ -1278,7 +1282,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 sparc64 | sparcv9* | ultrasparc*) - gcc_cflags="$gcc_cflags -Wa,-xarch=v8plus" ;; - *) -@@ -1231,7 +1234,7 @@ + gcc_32_cflags="$gcc_cflags -Wa,-xarch=v8plus" ;; + esac +@@ -1294,7 +1298,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" ;; -@@ -1253,7 +1256,7 @@ +@@ -1316,7 +1320,7 @@ # SunOS cc doesn't know -xarch, apparently always generating v7 # code, so make this optional @@ -166,7 +166,7 @@ sparcv8 | microsparc | supersparc | turbosparc) cc_cflags_arch="-xarch=v8" ;; sparc64 | sparcv9* | ultrasparc*) cc_cflags_arch="-xarch=v8plus" ;; -@@ -1268,7 +1271,7 @@ +@@ -1331,7 +1335,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" ;; -@@ -1280,7 +1283,7 @@ +@@ -1343,7 +1347,7 @@ esac esac @@ -184,16 +184,16 @@ sparc64 | sparcv9* | ultrasparc*) case $host in # Solaris 6 and earlier cannot run ABI=64 since it doesn't save -@@ -1307,7 +1310,7 @@ +@@ -1370,7 +1374,7 @@ *) abilist="64 32" ;; esac - case $host_cpu in + case $gmp_cpu in ultrasparc | ultrasparc2 | ultrasparc2i) - path_64="sparc64/ultrasparc12 sparc64" ;; + path_64="sparc64/ultrasparc1234 sparc64" ;; [ultrasparc[34]]) -@@ -1436,7 +1439,7 @@ +@@ -1505,7 +1509,7 @@ # duplicate anything. # gcc_cflags_optlist="cpu arch" diff --git a/gmp-tinfo.patch b/gmp-tinfo.patch index e95fc3b..19e98e5 100644 --- a/gmp-tinfo.patch +++ b/gmp-tinfo.patch @@ -1,5 +1,5 @@ ---- gmp-4.3.1/configure.in.orig 2009-10-03 08:32:51.312616803 +0200 -+++ gmp-4.3.1/configure.in 2009-10-03 08:33:58.340616803 +0200 +--- gmp-5.1.1/configure.ac.orig 2009-10-03 08:32:51.312616803 +0200 ++++ gmp-5.1.1/configure.ac 2009-10-03 08:33:58.340616803 +0200 @@ -3216,8 +3216,10 @@ AC_CONFIG_FILES(demos/calc/calc-config.h:demos/calc/calc-config-h.in) LIBCURSES= diff --git a/gmp.spec b/gmp.spec index f67965c..09995fa 100644 --- a/gmp.spec +++ b/gmp.spec @@ -12,17 +12,16 @@ 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.0.5 +Version: 5.1.1 Release: 1 License: LGPL v3+ Group: Libraries Source0: http://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.xz -# Source0-md5: 8aef50959acec2a1ad41d144ffe0f3b5 +# Source0-md5: 485b1296e6287fa381e6015b19767989 Patch0: %{name}-info.patch Patch1: %{name}-multilib.patch Patch2: %{name}-cpu.patch Patch3: %{name}-tinfo.patch -Patch4: %{name}-am.patch URL: http://gmplib.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.8 @@ -172,44 +171,6 @@ Bibliotecas estáticas para desenvolvimento com gmp. %description static -l ru.UTF-8 Это статическая библиотека GNU произвольной точности. -%package bsd -Summary: GNU arbitrary precision library - BSD-compatible MP library -Summary(pl.UTF-8): Biblioteka arytmetyczna GNU - biblioteka MP kompatybilna z BSD -Group: Libraries -# doesn't require base - -%description bsd -This package contains BSD-compatible MP library based on GNU MP. - -%description bsd -l pl.UTF-8 -Ten pakiet zawiera bibliotekę MP kompatybilną z BSD opartą na GNU MP. - -%package bsd-devel -Summary: GNU arbitrary precision library - BSD-compatible MP API -Summary(pl.UTF-8): Biblioteka arytmetyczna GNU - API MP kompatybilne z BSD -Group: Development/Libraries -Requires: %{name}-bsd = %{version}-%{release} - -%description bsd-devel -This package contains BSD-compatible MP library header file. - -%description bsd-devel -l pl.UTF-8 -Ten pakiet zawiera plik nagłówkowy biblioteki MP kompatybilnej z BSD. - -%package bsd-static -Summary: GNU arbitrary precision library - BSD-compatible static MP library -Summary(pl.UTF-8): Biblioteka arytmetyczna GNU - biblioteka statyczna MP kompatybilna z BSD -Group: Development/Libraries -Requires: %{name}-bsd-devel = %{version}-%{release} - -%description bsd-static -This package contains BSD-compatible MP static library based on GNU -MP. - -%description bsd-static -l pl.UTF-8 -Ten pakiet zawiera bibliotekę statyczną MP kompatybilną z BSD opartą -na GNU MP. - %package c++ Summary: GNU arbitrary precision library - C++ interface Summary(pl.UTF-8): Biblioteka arytmetyczna GNU - interfejs C++ @@ -260,7 +221,6 @@ arytmetycznej GNU. %endif %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %{__libtoolize} @@ -270,8 +230,7 @@ arytmetycznej GNU. %configure \ --with-cpu=%{_target_cpu} \ %{?with_cxx:--enable-cxx} \ - --enable-fft \ - --enable-mpbsd + --enable-fft %{__make} %{?with_tests:%{__make} check} @@ -294,9 +253,6 @@ rm -rf $RPM_BUILD_ROOT %postun devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%post bsd -p /sbin/ldconfig -%postun bsd -p /sbin/ldconfig - %post c++ -p /sbin/ldconfig %postun c++ -p /sbin/ldconfig @@ -317,20 +273,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libgmp.a -%files bsd -%attr(755,root,root) %{_libdir}/libmp.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libmp.so.3 - -%files bsd-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libmp.so -%{_libdir}/libmp.la -%{_includedir}/mp.h - -%files bsd-static -%defattr(644,root,root,755) -%{_libdir}/libmp.a - %if %{with cxx} %files c++ %defattr(644,root,root,755)