From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0592C138206 for ; Wed, 3 Jan 2018 15:23:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CE89E0896; Wed, 3 Jan 2018 15:23:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E5B2E0896 for ; Wed, 3 Jan 2018 15:23:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5510B335C09 for ; Wed, 3 Jan 2018 15:23:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7CA18A for ; Wed, 3 Jan 2018 15:22:59 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1514992975.ce669e75475c6e73dad1365857186719559ed33f.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/gmp/, dev-libs/gmp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch dev-libs/gmp/gmp-6.1.2.ebuild X-VCS-Directories: dev-libs/gmp/ dev-libs/gmp/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ce669e75475c6e73dad1365857186719559ed33f X-VCS-Branch: master Date: Wed, 3 Jan 2018 15:22:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5367540d-8724-4d6d-aa9c-119ce6085906 X-Archives-Hash: 34c9a01a5945a74f4b633a7804938cc7 commit: ce669e75475c6e73dad1365857186719559ed33f Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 3 15:22:44 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 3 15:22:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce669e75 dev-libs/gmp: add patch to aid bootstrapping with old gcc on darwin Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch | 21 +++++++++++++++++++++ dev-libs/gmp/gmp-6.1.2.ebuild | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch b/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch new file mode 100644 index 00000000000..8960464ac4f --- /dev/null +++ b/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch @@ -0,0 +1,21 @@ +--- gmp-6.0.0/gmp-h.in.orig 2015-01-16 22:25:51.000000000 +0100 ++++ gmp-6.0.0/gmp-h.in 2015-01-16 22:26:40.000000000 +0100 +@@ -360,14 +360,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) \ +- || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) ++#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 diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild index 266f6ce8b86..9134d5cfa90 100644 --- a/dev-libs/gmp/gmp-6.1.2.ebuild +++ b/dev-libs/gmp/gmp-6.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -39,6 +39,11 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch + # https://bugs.gentoo.org/536894 + if [[ ${CHOST} == *-darwin* ]] ; then + epatch "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch + fi + # GMP uses the "ABI" env var during configure as does Gentoo (econf). # So, to avoid patching the source constantly, wrap things up. mv configure configure.wrapped || die