Ticket #33297: oriToGmp504.patch

Portfile

@@ -33 +33 @@
 use_bzip2       yes
 use_parallel_build yes
 
-# See #16634
-patchfiles      patch-gmp-h.in.diff
-
-# Sandy Bridge not recognized. See #28892, #30211
-patchfiles-append patch-config.guess.i7.diff
-
 # llvm-gcc-4.2 fails make check
 if {${configure.compiler} == "llvm-gcc-4.2"} {
     if {[vercmp $xcodeversion 4.1] >= 0} {
@@ -65 +59 @@
 test.run        yes
 test.cmd        make
 test.target     check
-
-post-destroot {
-    # For the upgrade 4.3.2 -> 5.0.1 (r63519), do not force all packages which depend on GMP to be rebuilt.
-    ln -s libgmp.dylib ${destroot}${prefix}/lib/libgmp.3.dylib
-}
-
-if {![variant_isset universal]} {
-    if {${build_arch} == "x86_64"} {
-        configure.env   ABI=64
-        # fails to correctly detect some x86_64 models
-        pre-configure {
-            set build_triplet [split [exec /usr/bin/env CC=${configure.cc} ${worksrcpath}/config.guess] -]
-            set build_cpu [lindex $build_triplet 0]
-            if {$build_cpu != "core2" && $build_cpu != "corei"} {
-                ui_warn "No processor dependent assembly code being used. gmp might be slower."
-                configure.args-append --build=x86_64-[join [lrange $build_triplet 1 end] -]
-            }
-        }
-    } elseif {${build_arch} == "ppc64"} {
-        configure.env   ABI=mode64
-    } else {
-        configure.env   ABI=32
-    }
-} else {
-    # Keep configure.cflags and configure.cxxflags empty.
-    set merger_arch_flag no
-
-    array set merger_configure_env {
-        ppc     ABI=32
-        i386    ABI=32
-        ppc64   ABI=mode64
-        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
-
-        # PortGroup muniversal has difficulty merging three files.
-        if  { [llength ${universal_archs_to_use}] == 3 } {
-            set merger_dont_diff "${prefix}/include/gmp.h"
-        }
-    }
-
-    # For cross-compiling, set C compiler and pre-processor.
-    if { ${os.arch}=="i386" } {
-        if { ${os.major} >= 10 } {
-            lappend merger_configure_env(ppc)  CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
-        }
-        lappend merger_configure_env(ppc64)    CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
-    } else {
-        lappend merger_configure_env(i386)     CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
-        lappend merger_configure_env(x86_64)   CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
-    }
-}
-
-platform powerpc {
-    # See #9053
-    patchfiles-append  patch-config.guess.diff
-}

files/patch-config.guess.diff

@@ -1 @@
---- config.guess.orig   2009-05-12 08:12:12.000000000 +0200
-+++ config.guess        2009-05-21 10:24:48.000000000 +0200
-@@ -355,6 +355,7 @@
-   unsigned  (*fun)();
-   unsigned  pvr;
- 
-+  return 0;
-   /* a separate "fun" variable is necessary for gcc 2.95.2 on MacOS,
-      it gets a compiler error on a combined cast and call */
-   fun = (unsigned (*)()) getpvr.a;

files/patch-config.guess.i7.diff

@@ -1 @@
---- 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;

files/patch-gmp-h.in.diff

@@ -1 @@
---- gmp-h.in.orig       2010-01-07 13:09:02.000000000 -0700
-+++ gmp-h.in    2010-01-27 19:35:31.000000000 -0700
-@@ -421,13 +421,14 @@
-     GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
-     inline semantics, unless -fgnu89-inline is used.  */
- #ifdef __GNUC__
--#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2)
-+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
- #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
--#else
-+#define __GMP_INLINE_PROTOTYPES  1
-+#elif !(defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
- #define __GMP_EXTERN_INLINE      extern __inline__
--#endif
- #define __GMP_INLINE_PROTOTYPES  1
- #endif
-+#endif
- 
- /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
-    strict ANSI mode.  Inlining is done even when not optimizing (ie. -O0