[79373] trunk/dports/devel/gmp

[mcalhoun at macports.org]

Revision: 79373
          http://trac.macports.org/changeset/79373
Author:   mcalhoun at macports.org
Date:     2011-06-11 14:12:29 -0700 (Sat, 11 Jun 2011)
Log Message:
-----------
gmp: update version  5.0.1 ->  5.0.2

Modified Paths:
--------------
    trunk/dports/devel/gmp/Portfile

Removed Paths:
-------------
    trunk/dports/devel/gmp/files/patch-config.guess.i7.diff

Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile	2011-06-11 20:39:01 UTC (rev 79372)
+++ trunk/dports/devel/gmp/Portfile	2011-06-11 21:12:29 UTC (rev 79373)
@@ -5,8 +5,8 @@
 PortGroup  muniversal  1.0
 
 name            gmp
-version         5.0.1
-revision        1
+version         5.0.2
+revision        0
 categories      devel math
 maintainers     mcalhoun openmaintainer
 platforms       darwin
@@ -25,9 +25,9 @@
 homepage        http://gmplib.org/
 master_sites    gnu
 
-checksums           md5     6bac6df75c192a13419dfd71d19240a7 \
-                    sha1    6340edc7ceb95f9015a758c7c0d196eb0f441d49 \
-                    rmd160  3e89ebf5294639e1c926b92d9786bbdd0c8fa587
+checksums           md5     0bbaedc82fb30315b06b1588b9077cd3 \
+                    sha1    2968220e1988eabb61f921d11e5d2db5431e0a35 \
+                    rmd160  fce06e3246f067301a54f3457960f1d6d71adfc2
 
 use_bzip2       yes
 use_parallel_build yes
@@ -35,9 +35,6 @@
 # See #16634
 patchfiles      patch-gmp-h.in.diff
 
-# Until GMP 5.0.2 is released, Sandy Bridge not recognized. See #28892
-patchfiles-append patch-config.guess.i7.diff
-
 configure.args  --infodir=${prefix}/share/info \
                 --enable-cxx
 
@@ -52,9 +49,6 @@
 configure.cxxflags
 configure.pipe  no
 
-# Since CFLAGS and CXXFLAGS must be empty, append -arch ... to CC and CXX.
-merger_arch_compiler yes
-
 test.run        yes
 test.cmd        make
 test.target     check
@@ -92,6 +86,25 @@
         x86_64  ABI=64
     }
 
+    # Since CFLAGS and CXXFLAGS must be empty, append -arch ... to CC and CXX.
+    merger_arch_compiler yes
+    
+    # -arch i386 on causes the test suite to fail, so override muniversal_get_arch_flag in muniversal portgroup
+    # Only append -arch ... to compiler if cross compiling.
+    # i386 code is generated by setting ABI=32
+    proc muniversal_get_arch_flag {arch {fortran ""}} {
+        global os.arch
+        
+        if { ${os.arch}=="i386" && (${arch}=="i386" || ${arch}=="x86_64") } {
+            set archf ""
+        } elseif { ${os.arch}=="powerpc" && (${arch}=="ppc" && ${arch}=="ppc64") } {
+            set archf ""
+        } else {
+            set archf "-arch ${arch}"
+        }
+        return ${archf}
+    }
+    
     # universal_archs_to_use might not be set before pre-fetch.
     pre-destroot {
         global merger_dont_diff merger_configure_env

Deleted: trunk/dports/devel/gmp/files/patch-config.guess.i7.diff
===================================================================
--- trunk/dports/devel/gmp/files/patch-config.guess.i7.diff	2011-06-11 20:39:01 UTC (rev 79372)
+++ trunk/dports/devel/gmp/files/patch-config.guess.i7.diff	2011-06-11 21:12:29 UTC (rev 79373)
@@ -1,10 +0,0 @@
---- config.guess.orig	2010-02-06 05:43:13.000000000 -0700
-+++ config.guess	2011-04-10 09:11:34.000000000 -0700
-@@ -742,6 +742,7 @@
- 	  else if (model == 0x25)	modelstr = "corei"; /* WSM Clarkdale/Arrandale */
- 	  else if (model == 0x26)	modelstr = "atom";  /* Lincroft */
- 	  else if (model == 0x27)	modelstr = "atom";  /* Saltwell */
-+	  else if (model == 0x2a)	modelstr = "corei"; /* SB */
- 	  else if (model == 0x2c)	modelstr = "corei"; /* WSM Gulftown */
- 	  else if (model == 0x2e)	modelstr = "corei"; /* NHM Beckton */
- 	  break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110611/52c289a4/attachment.html>