[50591] trunk/dports/devel/gmp

[mcalhoun at macports.org]

Revision: 50591
          http://trac.macports.org/changeset/50591
Author:   mcalhoun at macports.org
Date:     2009-05-04 15:27:36 -0700 (Mon, 04 May 2009)
Log Message:
-----------
gmp: Some of the new (4.2.4 -> 4.3.0) spcialized assembly causes problems with Mac OS X.

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

Added Paths:
-----------
    trunk/dports/devel/gmp/files/patch-gmp-h.in.diff

Removed Paths:
-------------
    trunk/dports/devel/gmp/files/gmp-h.in.diff

Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile	2009-05-04 22:14:50 UTC (rev 50590)
+++ trunk/dports/devel/gmp/Portfile	2009-05-04 22:27:36 UTC (rev 50591)
@@ -6,6 +6,7 @@
 
 name            gmp
 version         4.3.0
+revision        1
 categories      devel math
 maintainers     mcalhoun openmaintainer
 platforms       darwin
@@ -32,11 +33,17 @@
 use_parallel_build yes
 
 # See http://trac.macports.org/ticket/16634
-patchfiles      gmp-h.in.diff
+# Use less specialized assembly so that all tests will pass.
+patchfiles      patch-gmp-h.in.diff patch-aors_n.asm.diff
 
 configure.args  --infodir=${prefix}/share/info \
                 --enable-cxx
 
+post-patch {
+    # Use less specialized assembly so that all tests will pass.
+    delete ${worksrcpath}/mpn/x86/p6/sse2/popcount.asm
+}
+
 # if CFLAGS and CXXFLAGS are undefined, configure script tries to build fastest library for build machine.
 # On PowerPC machines, CFLAGS must be empty to get -force_cpusubtype_ALL.
 pre-configure {

Deleted: trunk/dports/devel/gmp/files/gmp-h.in.diff
===================================================================
--- trunk/dports/devel/gmp/files/gmp-h.in.diff	2009-05-04 22:14:50 UTC (rev 50590)
+++ trunk/dports/devel/gmp/files/gmp-h.in.diff	2009-05-04 22:27:36 UTC (rev 50591)
@@ -1,20 +0,0 @@
---- gmp-h.in.orig	2009-04-14 05:36:30.000000000 -0700
-+++ gmp-h.in	2009-05-04 08:45:33.000000000 -0700
-@@ -421,12 +421,13 @@
-     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 && __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
\ No newline at end of file

Copied: trunk/dports/devel/gmp/files/patch-gmp-h.in.diff (from rev 50567, trunk/dports/devel/gmp/files/gmp-h.in.diff)
===================================================================
--- trunk/dports/devel/gmp/files/patch-gmp-h.in.diff	                        (rev 0)
+++ trunk/dports/devel/gmp/files/patch-gmp-h.in.diff	2009-05-04 22:27:36 UTC (rev 50591)
@@ -0,0 +1,20 @@
+--- gmp-h.in.orig	2009-04-14 05:36:30.000000000 -0700
++++ gmp-h.in	2009-05-04 08:45:33.000000000 -0700
+@@ -421,12 +421,13 @@
+     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 && __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
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090504/4a096e9a/attachment.html>