Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20832
Modified Files:
gmp.info
Added Files:
gmp5.info gmp5.patch
Log Message:
gmp.info: 4.3.2 upgrade
gmp5.{info,patch}: 5.0.1 (new)
gmp5 is installed in %p/lib/gmp5 and does not conflict with gmp(4)
to use it, pass --with-gmp=%p/lib/gmp5 as typical ConfigureParams
--- NEW FILE: gmp5.info ---
Info2: <<
Package: gmp5%type_pkg[-64bit]
Version: 5.0.1
Revision: 1
GCC: 4.0
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Source: mirror:gnu:gmp/gmp-%v.tar.gz
Source-MD5: 5ec19db53ced047b8d0d52373f6c245d
# PatchFile: %{ni}.patch
# PatchFile-MD5: a32c8651a786aa499afd6b3cb997c017
Depends: <<
%N-shlibs (= %v-%r),
libgmpxx5%type_pkg[-64bit]-shlibs (= %v-%r),
( %type_raw[-64bit] = -64bit ) 64bit-cpu
<<
BuildDepends: fink (>= 0.26.0), gcc4.0 (>= 4.0.1-1)
Conflicts: gmp5, gmp5-64bit
Replaces: gmp5, gmp5-64bit
SetCPPFLAGS: -fexceptions
ConfigureParams: <<
--prefix=%p/lib/gmp5 \
--infodir='${prefix}/share/info' \
--enable-cxx \
--disable-static
<<
CompileScript: <<
#! /bin/sh -ev
if [ "%type_raw[-64bit]" == "." ] ; then
case "%m" in
i386 | powerpc) ABI=32 ./configure %c --libdir='${prefix}/%lib';;
x86_64) ABI=64 ./configure %c --libdir='${prefix}/%lib';;
esac
else
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: <<
#!/bin/sh -ev
make DESTDIR=%d install
<<
DocFiles: COPYING COPYING.LIB README
InfoDocs: gmp.info gmp.info-1 gmp.info-2
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu
Files: lib/gmp5/%lib/libgmp.*.dylib
Shlibs: <<
%p/lib/gmp5/%lib/libgmp.10.dylib 11.0.0 %n (>= 5.0.1-1) %type_num[-64bit]
<<
Description: Shared library for gmp package
DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
<<
SplitOff2: <<
Package: libgmpxx5%type_pkg[-64bit]-shlibs
Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu, %N-shlibs
Files: lib/gmp5/%lib/libgmpxx.*.dylib
Shlibs: <<
%p/lib/gmp5/%lib/libgmpxx.4.dylib 7.0.0 %n (>= 5.0.0-1) %type_num[-64bit]
<<
Description: Shared C++ library for gmp package
DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
<<
License: LGPL
Description: GNU multiple precision arithmetic library
DescDetail: <<
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.
Starting with gmp5, we install to a private pkglib dir so that it may
coexist with other major versions of gmp without conflicts/replaces.
Since gmp5, static libraries have been removed in favor of shared-only.
<<
DescPort: <<
Older notes:
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.
The patch, provided by Martin Costabel, makes the 64bit variant compile on
the new MacBookPros whose core2 duo processor is misidentified as pentium3.
As of vers. 4.2.3, we are building with -fexceptions, for the benefit of
ppl library that will be used in gcc 4.4.x. (Suggested by Jack Howarth;
see http://www.cs.unipr.it/ppl/ and http://gcc.gnu.org/wiki/Graphite .)
<<
Maintainer: David Fang <fang...@users.sourceforge.net>
# Former maintainer: Dave Morrison <d...@finkproject.org>
Homepage: http://gmplib.org
<<
Index: gmp.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/gmp.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gmp.info 25 Feb 2010 04:30:36 -0000 1.9
+++ gmp.info 8 May 2010 05:13:14 -0000 1.10
@@ -1,23 +1,27 @@
Info2: <<
Package: gmp%type_pkg[-64bit]
-Version: 5.0.1
+Version: 4.3.2
Revision: 1
-GCC: 4.
+GCC: 4.0
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Source: mirror:gnu:gmp/gmp-%v.tar.gz
-Source-MD5: 5ec19db53ced047b8d0d52373f6c245d
-# PatchFile: %{ni}.patch
-# PatchFile-MD5: a32c8651a786aa499afd6b3cb997c017
-Depends: %N-shlibs (= %v-%r), libgmpxx5%type_pkg[-64bit]-shlibs (= %v-%r), (
%type_raw[-64bit] = -64bit ) 64bit-cpu
+Source-MD5: 2a431d487dfd76d0f618d241b1e551cc
+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
SetCPPFLAGS: -fexceptions
-ConfigureParams: --infodir='${prefix}/share/info' --enable-cxx --disable-static
+ConfigureParams: <<
+ --infodir='${prefix}/share/info' \
+ --enable-cxx
+<<
CompileScript: <<
#! /bin/sh -ev
- # export CC=gcc-4 CXX=g++-4
if [ "%type_raw[-64bit]" == "." ] ; then
case "%m" in
i386 | powerpc) ABI=32 ./configure %c --libdir='${prefix}/%lib';;
@@ -41,18 +45,18 @@
Replaces: gmp (<< 4.0.1-1)
Files: %lib/libgmp.*.dylib
Shlibs: <<
- %p/%lib/libgmp.10.dylib 11.0.0 %n (>= 5.0.1-1) %type_num[-64bit]
+ %p/%lib/libgmp.3.dylib 9.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
<<
SplitOff2: <<
- Package: libgmpxx5%type_pkg[-64bit]-shlibs
+ Package: libgmpxx%type_pkg[-64bit]-shlibs
Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu, %N-shlibs
Replaces: gmp (<< 4.0.1-1), gmp-shlibs (<< 4.1.4-1)
Files: %lib/libgmpxx.*.dylib
Shlibs: <<
- %p/%lib/libgmpxx.4.dylib 7.0.0 %n (>= 5.0.0-1) %type_num[-64bit]
+ %p/%lib/libgmpxx.4.dylib 6.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
@@ -70,6 +74,8 @@
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.
+ Future major versions should be installed to private pkglib dirs so
+ that multiple versions may coexist without conflict.
<<
DescPort: <<
Patch from Ben Hines to build libgmpxx, as of vers. 4.1-2. As of vers.
@@ -85,6 +91,7 @@
ppl library that will be used in gcc 4.4.x. (Suggested by Jack Howarth;
see http://www.cs.unipr.it/ppl/ and http://gcc.gnu.org/wiki/Graphite .)
<<
-Maintainer: Dave Morrison <d...@finkproject.org>
+Maintainer: David Fang <fang...@users.sourceforge.net>
+# Former maintainer: Dave Morrison <d...@finkproject.org>
Homepage: http://gmplib.org
<<
--- NEW FILE: gmp5.patch ---
--- gmp-5.0.0/mpn/x86_64/darwin.m4 2010-01-14 20:12:26.000000000 -0500
+++ gmp-5.0.0-patched/mpn/x86_64/darwin.m4 2010-01-14 20:15:09.000000000
-0500
@@ -22,4 +22,8 @@
dnl
dnl Simply override the definition in x86_64-defs.m4.
+define(`LEA',`
+ lea $1(%rip), $2
+')
+
define(`CALL',`call GSYM_PREFIX`'$1')
--- gmp-5.0.0/mpn/x86/invert_limb.asm Tue Jan 12 23:50:39 2010 +0100
+++ gmp-5.0.0-patched/mpn/x86/invert_limb.asm Fri Jan 15 00:27:41 2010 +0100
@@ -33,6 +33,13 @@
defframe(PARAM_DIVISOR,4)
+ASM_START()
+
+C Make approx_tab global to work around Apple relocation bug.
+ifdef(`DARWIN',`
+ define(`approx_tab', MPN(invert_limb_tab))
+ GLOBL approx_tab')
+
TEXT
ALIGN(16)
PROLOGUE(mpn_invert_limb)
@@ -95,9 +102,7 @@
EPILOGUE()
- RODATA
- ALIGN(2)
-approx_tab:
+DEF_OBJECT(approx_tab,2)
.value 0x7fe1,0x7fa1,0x7f61,0x7f22,0x7ee3,0x7ea4,0x7e65,0x7e27
.value 0x7de9,0x7dab,0x7d6d,0x7d30,0x7cf3,0x7cb6,0x7c79,0x7c3d
.value 0x7c00,0x7bc4,0x7b89,0x7b4d,0x7b12,0x7ad7,0x7a9c,0x7a61
@@ -162,3 +167,4 @@
.value 0x4179,0x4168,0x4157,0x4147,0x4136,0x4125,0x4115,0x4104
.value 0x40f4,0x40e3,0x40d3,0x40c2,0x40b2,0x40a2,0x4091,0x4081
.value 0x4071,0x4061,0x4050,0x4040,0x4030,0x4020,0x4010,0x4000
+END_OBJECT(approx_tab)
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
