Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21890

Modified Files:
        gmp.info gmp.patch 
Log Message:
move to stable


Index: gmp.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/gmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gmp.patch   20 Jan 2006 20:12:55 -0000      1.1
+++ gmp.patch   15 Nov 2006 05:14:22 -0000      1.2
@@ -1,69 +1,110 @@
---- gmp-4.1/configure.orig     2002-10-13 07:16:32.000000000 -0700
-+++ gmp-4.1/configure  2002-10-13 07:16:43.000000000 -0700
-@@ -10702,6 +10702,28 @@
-       ;;
-     esac
-     ;;
-+  darwin* | rhapsody*)
-+      case "$host_os" in
-+      rhapsody* | darwin1.[012])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+      *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+      esac
-+
-+      # FIXME: Relying on posixy $() will cause problems for
-+      #        cross-compilation, but unfortunately the echo tests do not
-+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+      #              `"' quotes if we put them in here... so don't!
-+      archive_cmds_CXX='$CC $(test .$module = .yes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags 
-install_name $rpath/$soname $verstring'
-+      # We need to add '_' to the symbols in $export_symbols first
-+      #_LT_AC_TAGVAR(archive_expsym_cmds, )="$_LT_AC_TAGVAR(archive_cmds, )"' 
&& strip -s $export_symbols'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      whole_archive_flag_spec='-all_load $convenience'
-+      ;;
-+
-   dgux*)
-     case $cc_basename in
-       ec++)
---- gmp-4.1/ltmain.sh.orig     2002-10-15 08:27:27.000000000 -0700
-+++ gmp-4.1/ltmain.sh  2002-10-15 08:28:36.000000000 -0700
-@@ -4445,10 +4445,10 @@
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--        if test "$installed" = no && test "$need_relink" = yes; then
--          $echo >> $output "\
--relink_command=\"$relink_command\""
--        fi
-+#       if test "$installed" = no && test "$need_relink" = yes; then
-+#         $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#       fi
-       done
-       fi
- 
-diff -ruN gmp-4.1.4/tests/cxx/Makefile.in 
gmp-4.1.4-patched/tests/cxx/Makefile.in
---- gmp-4.1.4/tests/cxx/Makefile.in    2004-09-22 13:26:19.000000000 -0700
-+++ gmp-4.1.4-patched/tests/cxx/Makefile.in    2005-10-01 22:21:05.000000000 
-0700
-@@ -142,7 +142,7 @@
-   $(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
- 
- 
[EMAIL PROTECTED]@check_PROGRAMS = t-cast t-headers t-ostream t-locale t-constr 
t-expr
[EMAIL PROTECTED]@check_PROGRAMS = t-cast t-headers t-ostream t-constr t-expr
- @[EMAIL PROTECTED] = $(check_PROGRAMS)
- 
- t_cast_SOURCES = t-cast.cc
-@@ -156,7 +156,7 @@
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- @[EMAIL PROTECTED] = t-cast$(EXEEXT) t-headers$(EXEEXT) \
[EMAIL PROTECTED]@      t-ostream$(EXEEXT) t-locale$(EXEEXT) \
[EMAIL PROTECTED]@      t-ostream$(EXEEXT)  \
- @WANT_CXX_TRUE@       t-constr$(EXEEXT) t-expr$(EXEEXT)
- @[EMAIL PROTECTED] =
- am_t_cast_OBJECTS = t-cast.$(OBJEXT)
+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

Index: gmp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/gmp.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gmp.info    5 Sep 2006 04:43:00 -0000       1.5
+++ gmp.info    15 Nov 2006 05:14:22 -0000      1.6
@@ -1,22 +1,26 @@
 Package: gmp
-Version: 4.1.4
-Revision: 1002
+Version: 4.2.1
+Revision: 1003
 GCC: 4.0
-Source: gnu
-Source-MD5: aa5e5fb3a7cdebe8c5b681a6cf4a670e
-Patch: %n.patch
+Source: mirror:gnu:gmp/gmp-%v.tar.gz
+Source-MD5: 5603ae75bc0cb1b21ad0187308a23c84
+PatchFile: gmp.patch
+PatchFile-MD5: bbde2ccf740c4db688f43f84a4d47e33
 Depends: gmp-shlibs (= %v-%r), libgmpxx4-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.9.9), gcc4.0 (>= 4.0.1-1)
+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
 CompileScript: <<
 #! /bin/sh -ev
 # Due to assembler differences on darwin x86 with ELF based gnu assemblers
-# we need to "turn off" assembley on the Intel build for now.
+# we need to "turn off" assembley on the Intel build for now.  We also need
+# to pass "ABI=32" during powerpc builds but not x86 builds.
 case "%m" in
 i386) ./configure --host=none-apple-darwin %c ;;
-powerpc) ./configure %c ;;
+powerpc) ABI=32 ./configure %c ;;
 esac
 make
 make check
@@ -34,7 +38,7 @@
   Replaces: gmp (<< 4.0.1-1)
   Files: lib/libgmp.*.dylib
   Shlibs: <<
-    %p/lib/libgmp.3.dylib 7.0.0 %n (>= 4.1-10)
+    %p/lib/libgmp.3.dylib 8.0.0 %n (>= 4.2.1-1)
   <<
   Description: Shared library for gmp package
   DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
@@ -44,7 +48,7 @@
   Replaces: gmp (<< 4.0.1-1), gmp-shlibs (<< 4.1.4-1)
   Files: lib/libgmpxx.*.dylib
   Shlibs: <<
-    %p/lib/libgmpxx.3.dylib 4.0.0 %n (>= 4.1.4-1)
+    %p/lib/libgmpxx.3.dylib 5.0.0 %n (>= 4.2.1-1)
   <<
   Description: Shared C++ library for gmp package
   DocFiles: doc/* AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README
@@ -59,16 +63,11 @@
  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.
 
- The C++ wrapper library should be used with some care, as it fails one
- of the tests from "make check."  For the moment, that test has been
- patched out so that the library can still be installed.
-
- Although the upstream maintainer advises compiling with gcc 3.3, we 
- compile here with gcc 4.0.1.  All tests pass, and the gcc 3.3 compiler
- is not available to us.
+ As of vers. 4.2, mpfr is a separate library, available in fink as the 
+ libmpfr1 package.
 
- Instead of building with --enable-mpfr, we now suggest using 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

Reply via email to