Update of /cvsroot/fink/experimental/dmrrsn
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27520
Modified Files:
gmp.info
Log Message:
test version of gmp using the new 64bit lib features in HEAD
Index: gmp.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmrrsn/gmp.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gmp.info 16 Nov 2006 06:48:47 -0000 1.3
+++ gmp.info 5 Dec 2006 06:38:56 -0000 1.4
@@ -1,61 +1,68 @@
-Package: gmp
+Info2: <<
+Package: gmp%type_pkg[-64bit]
Version: 4.2.1
-Revision: 4
-GCC: 3.3
+Revision: 1008
+GCC: 4.0
+Type: -64bit (boolean)
Source: mirror:gnu:gmp/gmp-%v.tar.gz
Source-MD5: 5603ae75bc0cb1b21ad0187308a23c84
-PatchFile: gmp.patch
+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: gmp-shlibs (= %v-%r), libgmpxx4-shlibs (= %v-%r)
+Depends: %N-shlibs (= %v-%r), libgmpxx4%type_pkg[-64bit]-shlibs (= %v-%r), (
%type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: fink (>= 0.24.24), 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
+ConfigureParams: --infodir='${prefix}/share/info' --enable-cxx
--libdir='${prefix}/%lib'
CompileScript: <<
#! /bin/sh -ev
-# Thanks to a patch, we no longer need to "turn off" assembly on the Intel
-# build. However, we still need to pass "ABI=32" during both powerpc
-# and x86 builds.
+ if [ "%type_raw[-64bit]" == "." ]; then
+ ABI=32 ./configure %c ;
+ make;
+ make check ;
+ else
+# Using Jason Martin's core2 port on intel.
+# On powerpc, "make check" fails.
case "%m" in
-i386) ABI=32 ./configure %c ;;
-powerpc) ABI=32 ./configure %c ;;
+i386) export CFLAGS="-m64 -fast"; ./configure %c --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; make ;;
esac
-make
-make check
+fi
<<
InstallScript: <<
make install prefix=%i
- ranlib %i/lib/libgmp.a
- ranlib %i/lib/libgmpxx.a
+ ranlib %i/%lib/libgmp.a
+ ranlib %i/%lib/libgmpxx.a
<<
-DocFiles: COPYING COPYING.LIB README
+DocFiles: COPYING COPYING.LIB README
../gmp-4.2.1-core2-port/README:README.core2-port
InfoDocs: gmp.info
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Replaces: gmp (<< 4.0.1-1)
- Files: lib/libgmp.*.dylib
+ Files: %lib/libgmp.*.dylib
Shlibs: <<
- %p/lib/libgmp.3.dylib 8.0.0 %n (>= 4.2.1-1)
+ %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
+ DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
../gmp-4.2.1-core2-port/README:README.core2-port
<<
SplitOff2: <<
- Package: libgmpxx4-shlibs
+ Package: libgmpxx4%type_pkg[-64bit]-shlibs
Replaces: gmp (<< 4.0.1-1), gmp-shlibs (<< 4.1.4-1)
- Files: lib/libgmpxx.*.dylib
+ Files: %lib/libgmpxx.*.dylib
Shlibs: <<
- %p/lib/libgmpxx.3.dylib 5.0.0 %n (>= 4.2.1-1)
+ %p/%lib/libgmpxx.3.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
+ DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
../gmp-4.2.1-core2-port/README:README.core2-port
<<
License: LGPL
Description: GNU multiple precision arithmetic library
@@ -69,9 +76,7 @@
As of vers. 4.2, mpfr is a separate library, available in fink as the
libmpfr1 package.
-
- On powerpc, we need to set ABI=32 for gmp and omit it for gmp-64bit to get
- gmp to build the correct (32-bit or 64-bit) libraries.
<<
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
Homepage: http://www.swox.com/gmp/
+<<
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
