summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2008-11-20 16:44:45 +0000
committeradam <adam@pkgsrc.org>2008-11-20 16:44:45 +0000
commit815c5962b0fb9646958a3a1fe2c83febef8dc89e (patch)
tree102e3f8160f62e1e785ec569e4b3a9ec601e174e /devel
parentaef2a666cad94aca228776008d5771a48430c5f7 (diff)
downloadpkgsrc-815c5962b0fb9646958a3a1fe2c83febef8dc89e.tar.gz
Fix for gcc-4.2 on Darwin
Diffstat (limited to 'devel')
-rw-r--r--devel/gmp/distinfo4
-rw-r--r--devel/gmp/patches/patch-ac21
2 files changed, 14 insertions, 11 deletions
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index b66ae8e5df7..0fd78d7e21b 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -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 --git a/devel/gmp/patches/patch-ac b/devel/gmp/patches/patch-ac
index 6793d507e82..f0d05e9f4dd 100644
--- a/devel/gmp/patches/patch-ac
+++ b/devel/gmp/patches/patch-ac
@@ -1,18 +1,21 @@
-$NetBSD: patch-ac,v 1.8 2008/08/17 07:56:11 bjs Exp $
+$NetBSD: patch-ac,v 1.9 2008/11/20 16:44:45 adam Exp $
-Apple's gcc build >5400 (since Xcode 3.0) doesn't support GNU inline in C99 mode
-
---- 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
-+#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