[pkgsrc/trunk]: pkgsrc/devel/gmp Fix for gcc-4.2 on Darwin

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e983b184572
branches:  trunk
changeset: 550374:4e983b184572
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 20 16:44:45 2008 +0000

description:
Fix for gcc-4.2 on Darwin

diffstat:

 devel/gmp/distinfo         |   4 ++--
 devel/gmp/patches/patch-ac |  23 +++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diffs (49 lines):

diff -r aa2bd5ee2dde -r 4e983b184572 devel/gmp/distinfo
--- a/devel/gmp/distinfo        Thu Nov 20 16:20:05 2008 +0000
+++ b/devel/gmp/distinfo        Thu Nov 20 16:44:45 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2008/10/09 10:56:16 wiz Exp $
+$NetBSD: distinfo,v 1.25 2008/11/20 16:44:45 adam Exp $
 
 SHA1 (gmp-4.2.4.tar.bz2) = bb721f94fbeeb8c609104540b408da6707c370ec
 RMD160 (gmp-4.2.4.tar.bz2) = 15c6c40c377088a3bcf9d432bcc27c777991cb12
 Size (gmp-4.2.4.tar.bz2) = 1710660 bytes
 SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6
 SHA1 (patch-ab) = e768eca25c117871041d12a618e38d9d252f25e5
-SHA1 (patch-ac) = 3120f7d207d65942910f8776786c0dbf6ee4d1b2
+SHA1 (patch-ac) = 9c7e6817632596bfd6c86a30e3b2d7f78fccd5ff
diff -r aa2bd5ee2dde -r 4e983b184572 devel/gmp/patches/patch-ac
--- a/devel/gmp/patches/patch-ac        Thu Nov 20 16:20:05 2008 +0000
+++ b/devel/gmp/patches/patch-ac        Thu Nov 20 16:44:45 2008 +0000
@@ -1,18 +1,21 @@
-$NetBSD: patch-ac,v 1.8 2008/08/17 07:56:11 bjs Exp $
-
-Apple's gcc build >5400 (since Xcode 3.0) doesn't support GNU inline in C99 mode
+$NetBSD: patch-ac,v 1.9 2008/11/20 16:44:45 adam Exp $
 
---- gmp-h.in.orig      2008-07-23 06:22:16.000000000 -0400
+--- gmp-h.in.orig      2008-09-10 23:02:01.000000000 +0200
 +++ gmp-h.in
-@@ -423,8 +423,11 @@ typedef __mpq_struct *mpq_ptr;
+@@ -421,6 +421,8 @@ typedef __mpq_struct *mpq_ptr;
+     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(__APPLE_CC__) && __APPLE_CC__ > 5400 && __STDC_VERSION__ >= 199901L
++#else
  #if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2)
  #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
  #else
-+#if defined(__APPLE_CC__) && __APPLE_CC__ > 5400 && __STDC_VERSION__ >= 199901L
-+#else
- #define __GMP_EXTERN_INLINE      extern __inline__
+@@ -428,6 +430,7 @@ typedef __mpq_struct *mpq_ptr;
+ #endif
+ #define __GMP_INLINE_PROTOTYPES  1
  #endif
 +#endif
- #define __GMP_INLINE_PROTOTYPES  1
- #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