| 1 |
commit: 095fbdbb6f191d8d55b838023395651b2b2befc9 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 25 09:20:51 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 25 09:22:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=095fbdbb |
| 7 |
|
| 8 |
sys-libs/musl: use CFLAGS,CPPFLAGS,LDFLAGS, bug #595950 |
| 9 |
|
| 10 |
Reported-by: Laine Gholson |
| 11 |
Closes: https://bugs.gentoo.org/595950 |
| 12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/musl/{musl-9999.ebuild => musl-1.2.0-r1.ebuild} | 11 +++++++---- |
| 16 |
sys-libs/musl/musl-9999.ebuild | 11 +++++++---- |
| 17 |
2 files changed, 14 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.0-r1.ebuild |
| 20 |
similarity index 92% |
| 21 |
copy from sys-libs/musl/musl-9999.ebuild |
| 22 |
copy to sys-libs/musl/musl-1.2.0-r1.ebuild |
| 23 |
index dc422c9426b..170c94aedcf 100644 |
| 24 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 25 |
+++ b/sys-libs/musl/musl-1.2.0-r1.ebuild |
| 26 |
@@ -17,7 +17,7 @@ else |
| 27 |
https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 28 |
https://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 29 |
https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 30 |
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
| 31 |
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
| 32 |
fi |
| 33 |
|
| 34 |
export CBUILD=${CBUILD:-${CHOST}} |
| 35 |
@@ -79,9 +79,12 @@ src_compile() { |
| 36 |
|
| 37 |
emake |
| 38 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 39 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
| 40 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
| 41 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
| 42 |
+ emake -C "${T}" getconf getent iconv \ |
| 43 |
+ CC="$(tc-getCC)" \ |
| 44 |
+ CFLAGS="${CFLAGS}" \ |
| 45 |
+ CPPFLAGS="${CPPFLAGS}" \ |
| 46 |
+ LDFLAGS="${LDFLAGS}" \ |
| 47 |
+ VPATH="${DISTDIR}" |
| 48 |
fi |
| 49 |
} |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 53 |
index dc422c9426b..170c94aedcf 100644 |
| 54 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 55 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 56 |
@@ -17,7 +17,7 @@ else |
| 57 |
https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 58 |
https://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 59 |
https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 60 |
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
| 61 |
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
| 62 |
fi |
| 63 |
|
| 64 |
export CBUILD=${CBUILD:-${CHOST}} |
| 65 |
@@ -79,9 +79,12 @@ src_compile() { |
| 66 |
|
| 67 |
emake |
| 68 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 69 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
| 70 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
| 71 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
| 72 |
+ emake -C "${T}" getconf getent iconv \ |
| 73 |
+ CC="$(tc-getCC)" \ |
| 74 |
+ CFLAGS="${CFLAGS}" \ |
| 75 |
+ CPPFLAGS="${CPPFLAGS}" \ |
| 76 |
+ LDFLAGS="${LDFLAGS}" \ |
| 77 |
+ VPATH="${DISTDIR}" |
| 78 |
fi |
| 79 |
} |
Archives