[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[Anthony G. Basile]

commit:     8946b320785d19ebc66ebece3ed47077e56d7c3c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 01:05:49 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 01:07:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8946b320

sys-libs/musl: version bump to 1.1.18, drop 1.1.17

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-libs/musl/Manifest                                   |  2 +-
 sys-libs/musl/{musl-1.1.17.ebuild => musl-1.1.18.ebuild} | 10 ++++++----
 sys-libs/musl/musl-9999.ebuild                           |  8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 6f35b19af5e..e48791002ac 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,4 +2,4 @@ DIST getconf.c 11614 SHA256 
d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae5
 DIST getent.c 9438 SHA256 
68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe SHA512 
b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 WHIRLPOOL 
473e54a9158e70c411f4c84e590bcfd245051212a3346a3c6dd45df9f09a5fbccbc8900ad7f8691eb5ebb8cd1002caf9519abaffb1753175d4f8acb1d32236b4
 DIST iconv.c 2577 SHA256 
f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 
9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 WHIRLPOOL 
8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc
 DIST musl-1.1.16.tar.gz 927178 SHA256 
937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 
47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140
 WHIRLPOOL 
d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
-DIST musl-1.1.17.tar.gz 936290 SHA256 
c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 SHA512 
bc99c7d58d64116c03e68fe77141a1f2938e0c01ba027937587a060d435b4b00b8b1f18c63fb8ed445ef36f377974e02a7b4821c793e4292041e31e66f145428
 WHIRLPOOL 
28cf246578c0a70d29a015a37136c9dda0b891b17048b35e84b2f4bebc47a417cd4dc3e6f7f7b5889393117e00b3f7469355338e44b063f79269824fdda4ffbd
+DIST musl-1.1.18.tar.gz 936274 SHA256 
d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 SHA512 
4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
 WHIRLPOOL 
ac1fbf970d501a51fb8e9d6215ea52cb2989446cea11d40c21bbd7ecaf6585c6616fb27ad4b6d21d6a3d1ff79854593a3bfd22b4ea0e35f499d3180a74aacd47

diff --git a/sys-libs/musl/musl-1.1.17.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
similarity index 90%
rename from sys-libs/musl/musl-1.1.17.ebuild
rename to sys-libs/musl/musl-1.1.18.ebuild
index 4c1f9a4c581..9e0e184d656 100644
--- a/sys-libs/musl/musl-1.1.17.ebuild
+++ b/sys-libs/musl/musl-1.1.18.ebuild
@@ -17,7 +17,7 @@ else
        https://dev.gentoo.org/~blueness/musl-misc/getconf.c
        https://dev.gentoo.org/~blueness/musl-misc/getent.c
        https://dev.gentoo.org/~blueness/musl-misc/iconv.c";
-       KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
+       KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -72,9 +72,11 @@ src_compile() {
        just_headers && return 0
 
        emake
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+       if [[ ${CATEGORY} != cross-* ]] ; then
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf 
|| die
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || 
die
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || 
die
+       fi
 }
 
 src_install() {

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 4b53b12d810..9e0e184d656 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -72,9 +72,11 @@ src_compile() {
        just_headers && return 0
 
        emake
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-       $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+       if [[ ${CATEGORY} != cross-* ]] ; then
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf 
|| die
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || 
die
+               $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || 
die
+       fi
 }
 
 src_install() {