Changeset 79373

Timestamp:

06/11/11 14:12:29 (4 years ago)

Author:

mcalhoun@…

Message:

gmp: update version 5.0.1 -> 5.0.2

Location:

trunk/dports/devel/gmp

Files:

• Portfile (modified) (5 diffs)
• files/patch-config.guess.i7.diff (deleted)

trunk/dports/devel/gmp/Portfile

@@ -6 +6 @@
 
 name            gmp
-version         5.0.1
-revision        1
+version         5.0.2
+revision        0
 categories      devel math
 maintainers     mcalhoun openmaintainer
@@ -26 +26 @@
 master_sites    gnu
 
-checksums           md5     6bac6df75c192a13419dfd71d19240a7 \
-                    sha1    6340edc7ceb95f9015a758c7c0d196eb0f441d49 \
-                    rmd160  3e89ebf5294639e1c926b92d9786bbdd0c8fa587
+checksums           md5     0bbaedc82fb30315b06b1588b9077cd3 \
+                    sha1    2968220e1988eabb61f921d11e5d2db5431e0a35 \
+                    rmd160  fce06e3246f067301a54f3457960f1d6d71adfc2
 
 use_bzip2       yes
@@ -35 +35 @@
 # 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 \
@@ -52 +49 @@
 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
@@ -93 +87 @@
     }
 
+    # 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 {