Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 04 Jan 2018 15:16:37
Message-Id: 1515078988.1a6eb443371bda4ef4c07ccb329d7cc7d2b47ed0.grobian@gentoo
1 commit: 1a6eb443371bda4ef4c07ccb329d7cc7d2b47ed0
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 15:14:26 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 15:16:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6eb443
7
8 eclass/multilib-build: fix ABI matching for ppc-macos
9
10 On Darwin, gcc emits __ppc__ or __ppc64__, not __powerpc__. Do
11 additionally allow the short variants to match, such that we can use the
12 wrapped packages on ppc-macos as well.
13
14 eclass/multilib-build.eclass | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
18 index 7c69f86b469..6356350c43b 100644
19 --- a/eclass/multilib-build.eclass
20 +++ b/eclass/multilib-build.eclass
21 @@ -497,8 +497,8 @@ multilib_prepare_wrappers() {
22 # else
23 # error "abi_s390_32 not supported by the package."
24 # endif
25 -#elif defined(__powerpc__)
26 -# if defined(__powerpc64__)
27 +#elif defined(__powerpc__) || defined(__ppc__)
28 +# if defined(__powerpc64__) || defined(__ppc64__)
29 # error "abi_ppc_64 not supported by the package."
30 # else
31 # error "abi_ppc_32 not supported by the package."