Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/gmp/, dev-libs/gmp/files/
Date: Sun, 01 May 2016 11:59:01
Message-Id: 1462103920.d21a2403298d3aba04bd1a283a797e56d20a20e9.grobian@gentoo
1 commit: d21a2403298d3aba04bd1a283a797e56d20a20e9
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 11:58:40 2016 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 11:58:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d21a2403
7
8 dev-libs/gmp: add fix for gcc-apple, bug #536894
9
10 Package-Manager: portage-2.2.26
11
12 dev-libs/gmp/files/gmp-6.0.0-gcc-inline-fix.patch | 21 +++++++++++++++++++++
13 dev-libs/gmp/gmp-6.1.0.ebuild | 1 +
14 2 files changed, 22 insertions(+)
15
16 diff --git a/dev-libs/gmp/files/gmp-6.0.0-gcc-inline-fix.patch b/dev-libs/gmp/files/gmp-6.0.0-gcc-inline-fix.patch
17 new file mode 100644
18 index 0000000..8960464
19 --- /dev/null
20 +++ b/dev-libs/gmp/files/gmp-6.0.0-gcc-inline-fix.patch
21 @@ -0,0 +1,21 @@
22 +--- gmp-6.0.0/gmp-h.in.orig 2015-01-16 22:25:51.000000000 +0100
23 ++++ gmp-6.0.0/gmp-h.in 2015-01-16 22:26:40.000000000 +0100
24 +@@ -360,14 +360,14 @@
25 + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
26 + inline semantics, unless -fgnu89-inline is used. */
27 + #ifdef __GNUC__
28 +-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \
29 +- || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
30 ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
31 + #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
32 +-#else
33 ++#define __GMP_INLINE_PROTOTYPES 1
34 ++#elif !(defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && __STDC_VERSION__ >= 199901L)
35 + #define __GMP_EXTERN_INLINE extern __inline__
36 +-#endif
37 + #define __GMP_INLINE_PROTOTYPES 1
38 + #endif
39 ++#endif
40 +
41 + /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
42 + strict ANSI mode. Inlining is done even when not optimizing (ie. -O0
43
44 diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
45 index 55b774b..a50f6d4 100644
46 --- a/dev-libs/gmp/gmp-6.1.0.ebuild
47 +++ b/dev-libs/gmp/gmp-6.1.0.ebuild
48 @@ -39,6 +39,7 @@ src_prepare() {
49 elibtoolize
50
51 epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
52 + epatch "${FILESDIR}"/${PN}-6.0.0-gcc-inline-fix.patch
53
54 # GMP uses the "ABI" env var during configure as does Gentoo (econf).
55 # So, to avoid patching the source constantly, wrap things up.