Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7079
Modified Files:
gmp.info
Added Files:
libgmpxx4-shlibs.info libgmpxx4-shlibs.patch
Removed Files:
gmp.patch
Log Message:
new upstream version
--- gmp.patch DELETED ---
--- NEW FILE: libgmpxx4-shlibs.info ---
Info2: <<
Package: libgmpxx4%type_pkg[-64bit]-shlibs
Version: 4.2.1
Revision: 1008
GCC: 4.0
Type: -64bit (boolean)
Source: mirror:gnu:gmp/gmp-%v.tar.gz
Source-MD5: 5603ae75bc0cb1b21ad0187308a23c84
Source2: http://www.math.jmu.edu/~martin/gmp-4.2.1-core2-port.tar.gz
Source2-MD5: 0e0dcd8fc12461a54947c522635287e8
PatchFile: %{Ni}.patch
PatchFile-MD5: 791a47972ef252dffe0d12105c446e4b
PatchScript: <<
patch -p1 < %{PatchFile}
cd mpn/x86; rm *dive_1* */*dive_1* */*/*dive_1*; rm */*mode1o* */*/*mode1o*
<<
Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: fink (>= 0.26.0), gcc4.0 (>= 4.0.1-1)
Replaces: gmp (<< 4.0.1-1)
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --infodir='${prefix}/share/info' --enable-cxx
CompileScript: <<
#! /bin/sh -ev
if [ "%type_raw[-64bit]" == "." ]; then
ABI=32 ./configure %c --libdir='${prefix}/%lib';
make;
make check ;
else
# Using Jason Martin's core2 port on intel.
# On powerpc, "make check" fails.
case "%m" in
i386) export CFLAGS="-m64 -fast"; ./configure %c --libdir='${prefix}/%lib'
--build=amd64-apple-darwin; cp ../gmp-4.2.1-core2-port/amd64call.asm tests; cp
../gmp-4.2.1-core2-port/add_n.asm ../gmp-4.2.1-core2-port/sub_n.asm
../gmp-4.2.1-core2-port/lahf_sahf_test.sh mpn; make; make check ;;
powerpc) ABI=mode64 ./configure %c --libdir='${prefix}/%lib'; make ;;
esac
fi
<<
InstallScript: <<
make install prefix=%i
rm -r %i/include %i/share/info %i/%lib/libgmp.* %i/%lib/libgmpxx.dylib
%i/%lib/libgmpxx.a %i/%lib/libgmpxx.la
<<
Shlibs: <<
%p/%lib/libgmpxx.3.dylib 5.0.0 %n (>= 4.2.1-1) %type_num[-64bit]
<<
Description: Shared C++ library for gmp package (obsolete version)
DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
../gmp-4.2.1-core2-port/README:README.core2-port
License: LGPL
DescDetail: <<
GNU MP is a portable library written in C for arbitrary precision
arithmetic on integers, rational numbers, and floating-point numbers.
<<
DescPort: <<
Patch from Ben Hines to build libgmpxx, as of vers. 4.1-2. As of vers.
4.1.4-1, libgmpxx gets its own splitoff.
As of vers. 4.2, mpfr is a separate library, available in fink as the
libmpfr1 package.
<<
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
Homepage: http://www.swox.com/gmp/
<<
--- NEW FILE: libgmpxx4-shlibs.patch ---
from:
http://swox.com/list-archives/gmp-discuss/2006-May/002344.html
diff -p -2 -r1.1 -r1.2
*** ./mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1
--- ./mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2
***************
*** 1,5 ****
/* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero
length.
! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
--- 1,5 ----
/* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero
length.
! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 59,63 ****
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
#else
--- 59,63 ----
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_add_nc
acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
#else
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 65,69 ****
acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
#endif
! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
--- 65,69 ----
acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
#endif
! #if HAVE_NATIVE_mpn_sub_nc
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 82,86 ****
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
--- 82,86 ----
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_sub_nc
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 88,92 ****
scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
#endif
! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
#else
--- 88,92 ----
scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
#endif
! #if HAVE_NATIVE_mpn_add_nc
acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
#else
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 98,102 ****
else
{
! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
Need temporary storage. */
mp_limb_t tp[PART_SIZE];
--- 98,102 ----
else
{
! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice
versa)
Need temporary storage. */
mp_limb_t tp[PART_SIZE];
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 106,110 ****
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
#else
--- 106,110 ----
{
this_n = MIN (n - off, PART_SIZE);
! #if HAVE_NATIVE_mpn_add_nc
acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
#else
*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
*** 112,116 ****
acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
#endif
! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
--- 112,116 ----
acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
#endif
! #if HAVE_NATIVE_mpn_sub_nc
scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
#else
--- gmp-4.2.1/configure 2006-05-04 09:50:26.000000000 -0700
+++ gmp-4.2.1-patched/configure 2006-08-10 10:06:56.000000000 -0700
@@ -3569,7 +3569,7 @@
fi
case $host in
- x86_64-*-*)
+ x86_64-*-*|pentium3-apple-darwin*)
abilist="64 32"
path_64="x86_64"
cclist_64="gcc"
Index: gmp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/gmp.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gmp.info 22 Dec 2006 17:13:09 -0000 1.13
+++ gmp.info 1 Dec 2007 21:57:10 -0000 1.14
@@ -1,48 +1,31 @@
Info2: <<
Package: gmp%type_pkg[-64bit]
-Version: 4.2.1
-Revision: 1008
+Version: 4.2.2
+Revision: 1000
GCC: 4.0
Type: -64bit (boolean)
Source: mirror:gnu:gmp/gmp-%v.tar.gz
-Source-MD5: 5603ae75bc0cb1b21ad0187308a23c84
-Source2: http://www.math.jmu.edu/~martin/gmp-4.2.1-core2-port.tar.gz
-Source2-MD5: 0e0dcd8fc12461a54947c522635287e8
-PatchFile: %{Ni}.patch
-PatchFile-MD5: 791a47972ef252dffe0d12105c446e4b
-PatchScript: <<
- patch -p1 < %{PatchFile}
- cd mpn/x86; rm *dive_1* */*dive_1* */*/*dive_1*; rm */*mode1o* */*/*mode1o*
-<<
-Depends: %N-shlibs (= %v-%r), libgmpxx4%type_pkg[-64bit]-shlibs (= %v-%r), (
%type_raw[-64bit] = -64bit ) 64bit-cpu
+Source-MD5: 1def49df60248a08374ecd6cdcaa5d3d
+Depends: %N-shlibs (= %v-%r), libgmpxx%type_pkg[-64bit]-shlibs (= %v-%r), (
%type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: fink (>= 0.26.0), gcc4.0 (>= 4.0.1-1)
Conflicts: gmp, gmp-64bit
Replaces: gmp, gmp-64bit
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
ConfigureParams: --infodir='${prefix}/share/info' --enable-cxx
CompileScript: <<
#! /bin/sh -ev
if [ "%type_raw[-64bit]" == "." ]; then
ABI=32 ./configure %c --libdir='${prefix}/%lib';
- make;
- make check ;
else
-# Using Jason Martin's core2 port on intel.
-# On powerpc, "make check" fails.
-case "%m" in
-i386) export CFLAGS="-m64 -fast"; ./configure %c --libdir='${prefix}/%lib'
--build=amd64-apple-darwin; cp ../gmp-4.2.1-core2-port/amd64call.asm tests; cp
../gmp-4.2.1-core2-port/add_n.asm ../gmp-4.2.1-core2-port/sub_n.asm
../gmp-4.2.1-core2-port/lahf_sahf_test.sh mpn; make; make check ;;
-powerpc) ABI=mode64 ./configure %c --libdir='${prefix}/%lib'; make ;;
-esac
+ case "%m" in
+ i386) ABI=64 ./configure %c --libdir='${prefix}/%lib';;
+ powerpc) ABI=mode64 ./configure %c --libdir='${prefix}/%lib';;
+ esac
fi
+make
+make check
<<
-InstallScript: <<
- make install prefix=%i
- ranlib %i/%lib/libgmp.a
- ranlib %i/%lib/libgmpxx.a
-<<
-DocFiles: COPYING COPYING.LIB README
../gmp-4.2.1-core2-port/README:README.core2-port
-InfoDocs: gmp.info
+DocFiles: COPYING COPYING.LIB README
+InfoDocs: gmp.info gmp.info-1 gmp.info-2
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
@@ -52,17 +35,17 @@
%p/%lib/libgmp.3.dylib 8.0.0 %n (>= 4.2.1-1) %type_num[-64bit]
<<
Description: Shared library for gmp package
- DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
../gmp-4.2.1-core2-port/README:README.core2-port
+ DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
<<
SplitOff2: <<
- Package: libgmpxx4%type_pkg[-64bit]-shlibs
+ Package: libgmpxx%type_pkg[-64bit]-shlibs
Replaces: gmp (<< 4.0.1-1), gmp-shlibs (<< 4.1.4-1)
Files: %lib/libgmpxx.*.dylib
Shlibs: <<
- %p/%lib/libgmpxx.3.dylib 5.0.0 %n (>= 4.2.1-1) %type_num[-64bit]
+ %p/%lib/libgmpxx.4.dylib 5.0.0 %n (>= 4.2.1-1) %type_num[-64bit]
<<
Description: Shared C++ library for gmp package
- DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
../gmp-4.2.1-core2-port/README:README.core2-port
+ DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
<<
License: LGPL
Description: GNU multiple precision arithmetic library
@@ -70,6 +53,14 @@
GNU MP is a portable library written in C for arbitrary precision
arithmetic on integers, rational numbers, and floating-point numbers.
<<
+DescPackaging: <<
+ Unfortunately, the libgmpxx4 splitoff, which existed from vers. 4.1.4-1
+ through vers. 4.2.1-1008, was misnamed. It *should* have been called
+ libgmpxx3, and the new version of that library should now be in a splitoff
+ called libgmpxx4. To work around this, the splitoff is now called
+ libgmpxx (with no number); note that the next time the major version of
+ this library changes, the splitoff should go to libgmpxx5.
+<<
DescPort: <<
Patch from Ben Hines to build libgmpxx, as of vers. 4.1-2. As of vers.
4.1.4-1, libgmpxx gets its own splitoff.
@@ -78,5 +69,5 @@
libmpfr1 package.
<<
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
-Homepage: http://www.swox.com/gmp/
+Homepage: http://gmplib.org
<<
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
