OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Mar-2006 09:32:56
Branch: HEAD Handle: 2006032708325600
Modified files:
openpkg-src/gmp gmp.patch gmp.spec
Log:
upgrading package: gmp 4.1.4 -> 4.2
Summary:
Revision Changes Path
1.2 +169 -69 openpkg-src/gmp/gmp.patch
1.35 +3 -2 openpkg-src/gmp/gmp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gmp/gmp.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 gmp.patch
--- openpkg-src/gmp/gmp.patch 20 Feb 2005 09:06:52 -0000 1.1
+++ openpkg-src/gmp/gmp.patch 27 Mar 2006 07:32:56 -0000 1.2
@@ -1,93 +1,193 @@
Index: configure
---- configure.orig 2004-09-21 15:06:47.000000000 +0200
-+++ configure 2005-02-20 09:59:27.488990608 +0100
-@@ -2476,89 +2476,6 @@
- sh-*-*) path="sh" ;;
+--- configure.orig 2006-03-22 17:27:26 +0100
++++ configure 2006-03-27 09:23:28 +0200
+@@ -3189,189 +3189,6 @@
sh2-*-*) path="sh/sh2 sh" ;;
+
- *sparc*-*-*)
-- # For cc and acc, -g disables -O, so it's not used
+- # sizeof(long)==4 or 8 is tested, to ensure we get the right ABI. We've
+- # had various bug reports where users have set CFLAGS for their desired
+- # mode, but not set our ABI. For some reason it's sparc where this
+- # keeps coming up, presumably users there are accustomed to driving the
+- # compiler mode that way. The effect of our testlist setting is to
+- # reject ABI=64 in favour of ABI=32 if the user has forced the flags to
+- # 32-bit mode.
+- #
+- abilist="32"
- cclist="gcc acc cc"
-- path="sparc32"
-- gcc_cflags="-g -O2"
-- gcc_cflags_optlist="cpu"
-- gcc_cflags_cpu=
-- acc_cflags="-O2"
-- cc_cflags="-O2"
+- any_testlist="sizeof-long-4"
-
-echo "include_mpn(\`sparc32/sparc-defs.m4')" >> $gmp_tmpconfigm4i
-
-- # FIXME: This should be selected according to the CPU
-- if test x${floating_point} = xno
-- then extra_functions="udiv_nfp"
-- else extra_functions="udiv_fp"
-- fi
-
+- case $host_cpu in
+- sparcv8 | microsparc | turbosparc)
+- path="sparc32/v8 sparc32" ;;
+- supersparc)
+- path="sparc32/v8/supersparc sparc32/v8 sparc32" ;;
+- sparc64 | sparcv9* | ultrasparc*)
+- path="sparc32/v9 sparc32/v8 sparc32" ;;
+- *)
+- path="sparc32" ;;
+- esac
+-
+- # gcc 2.7.2 doesn't know about v9 and doesn't pass -xarch=v8plus to the
+- # assembler. Add it explicitly since the solaris assembler won't accept
+- # our sparc32/v9 asm code without it. gas accepts -xarch=v8plus too, so
+- # it can be in the cflags unconditionally (though gas doesn't need it).
+- #
+- # gcc -m32 is needed to force 32-bit mode on a dual-ABI system, but past
+- # gcc doesn't know that flag, hence cflags_maybe. Note that -m32 cannot
+- # be done through the optlist since the plain cflags would be run first
+- # and we don't want to require the default mode (whatever it is) works.
+- #
+- # Note it's gcc_32_cflags_maybe and not gcc_cflags_maybe because the
+- # latter would be used in the 64-bit ABI on systems like "*bsd" where
+- # abilist="64" only.
+- #
+- case $host_cpu in
+- sparc64 | sparcv9* | ultrasparc*)
+- gcc_cflags="-O2 -Wa,-xarch=v8plus" ;;
+- *)
+- gcc_cflags="-O2" ;;
+- esac
+- gcc_32_cflags_maybe="-m32"
+- gcc_cflags_optlist="cpu"
+-
+- # gcc 2.7.2 knows -mcypress, -msupersparc, -mv8, -msparclite.
+- # gcc 2.95 knows -mcpu= v7, hypersparc, sparclite86x, f930, f934,
+- # sparclet, tsc701, v9, ultrasparc. A warning is given that the
+- # plain -m forms will disappear.
+- # gcc 3.0 adds nothing.
+- # gcc 3.1 adds nothing.
+- # gcc 3.2 adds nothing.
+- # gcc 3.3 adds ultrasparc3.
+- #
+- case $host_cpu in
+- supersparc) gcc_cflags_cpu="-mcpu=supersparc -msupersparc"
;;
+- sparcv8 | microsparc | turbosparc)
+- gcc_cflags_cpu="-mcpu=v8 -mv8" ;;
+- sparc64 | sparcv9*) gcc_cflags_cpu="-mcpu=v9 -mv8" ;;
+- ultrasparc3) gcc_cflags_cpu="-mcpu=ultrasparc3
-mcpu=ultrasparc -mv8" ;;
+- ultrasparc*) gcc_cflags_cpu="-mcpu=ultrasparc -mv8" ;;
+- *) gcc_cflags_cpu="-mcpu=v7 -mcypress" ;;
+- esac
+-
+- # SunPRO cc and acc, and SunOS bundled cc
- case $host in
-- sparcv8*-*-* | supersparc*-*-* | microsparc*-*-*)
-- gcc_cflags_cpu="-mcpu=v8 -mv8"
-- acc_cflags="-O2 -cg92"
-- path="sparc32/v8 sparc32"
-- extra_functions="udiv"
+- *-*-solaris* | *-*-sunos*)
+- # Note no -g, it disables all optimizations.
+- cc_cflags=
+- cc_cflags_optlist="opt arch cpu"
+-
+- # SunOS cc doesn't know -xO4, fallback to -O2.
+- cc_cflags_opt="-xO4 -O2"
+-
+- # SunOS cc doesn't know -xarch, apparently always generating v7
+- # code, so make this optional
+- case $host_cpu in
+- sparcv8 | microsparc | supersparc | turbosparc)
+- cc_cflags_arch="-xarch=v8" ;;
+- sparc64 | sparcv9* | ultrasparc*)
cc_cflags_arch="-xarch=v8plus" ;;
+- *)
cc_cflags_arch="-xarch=v7" ;;
+- esac
+-
+- # SunOS cc doesn't know -xchip and doesn't seem to have an
equivalent.
+- # SunPRO cc 5 recognises -xchip=generic, old, super, super2,
micro,
+- # micro2, hyper, hyper2, powerup, ultra, ultra2, ultra2i.
+- # SunPRO cc 6 adds -xchip=ultra2e, ultra3cu.
+- #
+- # FIXME: Which of ultra, ultra2 or ultra2i is the best fallback
for
+- # ultrasparc3?
+- #
+- case $host_cpu in
+- supersparc) cc_cflags_cpu="-xchip=super" ;;
+- microsparc) cc_cflags_cpu="-xchip=micro" ;;
+- turbosparc) cc_cflags_cpu="-xchip=micro2" ;;
+- ultrasparc) cc_cflags_cpu="-xchip=ultra" ;;
+- ultrasparc2) cc_cflags_cpu="-xchip=ultra2" ;;
+- ultrasparc2i) cc_cflags_cpu="-xchip=ultra2i" ;;
+- ultrasparc3) cc_cflags_cpu="-xchip=ultra3 -xchip=ultra" ;;
+- *) cc_cflags_cpu="-xchip=generic" ;;
+- esac
+- esac
-
+- case $host_cpu in
+- sparc64 | sparcv9* | ultrasparc*)
- case $host in
-- *-*-solaris2.*) cc_cflags="-xtarget=native -xarch=v8 -xO4" ;;
-- esac
-- case $host in
-- supersparc*-*-*) path="sparc32/v8/supersparc sparc32/v8 sparc32"
;;
+- # Solaris 6 and earlier cannot run ABI=64 since it doesn't save
+- # registers properly, so ABI=32 is left as the only choice.
+- #
+- *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
+-
+- # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only
+- # choice. In fact they need no special compiler flags, gcc -m64
+- # is the default, but it doesn't hurt to add it. v9 CPUs always
+- # use the sparc64 port, since the plain 32-bit sparc ports don't
+- # run on a v9.
+- #
+- *-*-*bsd*) abilist="64" ;;
+-
+- # For all other systems, we try both 64 and 32.
+- #
+- # GNU/Linux sparc64 has only recently gained a 64-bit user mode.
+- # In the past sparc64 meant a v9 cpu, but there were no 64-bit
+- # operations in user mode. We assume that if "gcc -m64" works
+- # then the system is suitable. Hopefully even if someone attempts
+- # to put a new gcc and/or glibc on an old system it won't run.
+- #
+- *) abilist="64 32" ;;
- esac
-- ;;
-
-- # sparc64-*-linux-gnu is a misnomer, since there's no support for any
-- # 64-bit operations in user mode. We assume that a future release
-- # will have some 64-bit support and that the gcc options will be the
-- # same as on solaris.
-- #
-- # cc -xarch actually controls the ABI, hence it must be v8 for 32-bit,
-- # even though the chip is v9.
-- #
-- sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
-- path="sparc32/v9 sparc32/v8 sparc32"
-- extra_functions="udiv_fp"
--
-- SPEED_CYCLECOUNTER_OBJ=sparcv9.lo
--
-- gcc_cflags="-g -O2 -Wa,-xarch=v8plus"
-- gcc_cflags_cpu="-mcpu=ultrasparc -mcpu=v9 -mcpu=v8 -mv8"
--
-- # must have -xarch=v8plus here, to get the right assembler options
-- # for our mpn/sparc32/v9 code
-- cc_cflags="-xtarget=native -xarch=v8plus -xO4"
+- path_64="sparc64"
+- cclist_64="gcc"
+- any_64_testlist="sizeof-long-8"
+-
+- # gcc -mptr64 is probably implied by -m64, but we're not sure if
+- # this was always so. On Solaris in the past we always used both
+- # "-m64 -mptr64".
+- #
+- # gcc -Wa,-xarch=v9 is thought to be necessary in some cases on
+- # solaris, but it would seem likely that if gcc is going to generate
+- # 64-bit code it will have to add that option itself where needed.
+- # An extra copy of this option should be harmless though, but leave
+- # it until we're sure. (Might want -xarch=v9a or -xarch=v9b for the
+- # higher cpu types instead.)
+- #
+- gcc_64_cflags="-O2 -m64 -mptr64"
+- gcc_64_ldflags="-Wc,-m64"
+- gcc_64_cflags_optlist="cpu"
-
- case $host in
-- *-*-solaris2.[7-9])
-- # solaris prior to 2.6 doesn't save registers properly, so the
-- # 64-bit ABI is only available for 2.7 up
-- abilist="64 32"
-- path_64="sparc64"
-- cclist_64="gcc cc"
-- gcc_64_cflags="-g -O2 -m64 -mptr64 -Wa,-xarch=v9 -mcpu=v9"
-- gcc_64_ldflags="-Wc,-m64"
-- # -fast enables different optimizations depending compiler version
-- # -fns=no and -fsimple=1 disables some transformations that
-- # conflict with IEEE 754, which some compiler versions perform.
+- *-*-solaris*)
+- # Sun cc.
+- #
+- # -fast enables different optimizations depending on compiler
+- # version. Unfortunately it does things according to the native
+- # system, which may not be optimal when cross compiling (to a
+- # different sparc). -xchip from cc_cflags_cpu will override at
+- # least that part of its selections.
+- #
+- # -fns=no and -fsimple=1 disable some transformations that
+- # conflict with IEEE 754, which some compiler versions perform
+- # under -fast.
+- #
+- cclist_64="$cclist_64 cc"
- cc_64_cflags="-fast -fns=no -fsimple=1 -xarch=v9"
-- SPEED_CYCLECOUNTER_OBJ_64=sparcv9.lo
-- cyclecounter_size_64=2
-- ;;
-- *-*-*bsd*)
-- # NetBSD and OpenBSD sparc64
-- abilist="64"
-- extra_functions=
-- path="sparc64"
-- gcc_cflags="-g -O2"
-- cyclecounter_size=2
+- cc_64_cflags_optlist="cpu"
- ;;
- esac
-- ;;
+-
+- # using the v9 %tick register
+- SPEED_CYCLECOUNTER_OBJ_32=sparcv9.lo
+- SPEED_CYCLECOUNTER_OBJ_64=sparcv9.lo
+- cyclecounter_size_32=2
+- cyclecounter_size_64=2
+- ;;
- esac
- ;;
-
+
# VAX
vax*-*-*)
- # Currently (version 3.0) gcc on vax always uses a frame pointer
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gmp/gmp.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 gmp.spec
--- openpkg-src/gmp/gmp.spec 1 Jan 2006 13:14:07 -0000 1.34
+++ openpkg-src/gmp/gmp.spec 27 Mar 2006 07:32:56 -0000 1.35
@@ -32,8 +32,8 @@
Class: BASE
Group: Algorithm
License: LGPL
-Version: 4.1.4
-Release: 20051016
+Version: 4.2
+Release: 20060327
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gmp/gmp-%{version}.tar.gz
@@ -78,6 +78,7 @@
esac
./configure \
--prefix=%{l_prefix} \
+ --enable-cxx \
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
