[gentoo-commits] proj/musl:master commit in: sys-devel/gcc/

[Aric Belsito]

commit:     bb8bb503cc28b1cf57bbc2b8a16b0f735f6e1b3b
Author:     Dave Flogeras <dflogeras2 <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 22:46:07 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Dec 14 22:46:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb8bb503

Widen toolchain stanza when cross-compiling for those with -musleabi

 sys-devel/gcc/gcc-4.9.4-r100.ebuild | 2 +-
 sys-devel/gcc/gcc-4.9.4-r99.ebuild  | 2 +-
 sys-devel/gcc/gcc-5.4.0-r3.ebuild   | 2 +-
 sys-devel/gcc/gcc-6.4.0.ebuild      | 2 +-
 sys-devel/gcc/gcc-7.2.0.ebuild      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-devel/gcc/gcc-4.9.4-r100.ebuild 
b/sys-devel/gcc/gcc-4.9.4-r100.ebuild
index a307fbd..8ebef29 100644
--- a/sys-devel/gcc/gcc-4.9.4-r100.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r100.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 
        toolchain_src_prepare
 
-       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
                cd "${S}"
                sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
                mv libstdc\+\+-v3/config/os/gnu-linux 
libstdc\+\+-v3/config/os/gnu-linux.org

diff --git a/sys-devel/gcc/gcc-4.9.4-r99.ebuild 
b/sys-devel/gcc/gcc-4.9.4-r99.ebuild
index 4fdb806..a65bc67 100644
--- a/sys-devel/gcc/gcc-4.9.4-r99.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r99.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 
        toolchain_src_prepare
 
-       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
                cd "${S}"
                sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
                mv libstdc\+\+-v3/config/os/gnu-linux 
libstdc\+\+-v3/config/os/gnu-linux.org

diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild 
b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index f147ac9..91ec961 100644
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch
        epatch "${FILESDIR}"/${PN}-5.4.0-pr71696-CVE-2016-6131.patch
 
-       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
                epatch "${FILESDIR}"/4.9.4/gthread.patch
                epatch "${FILESDIR}"/4.9.4/boehm_gc.patch
                epatch "${FILESDIR}"/4.9.4/posix_memalign.patch

diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index dd3ca69..b254f9f 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
        # Upstream Patch
        epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch
 
-       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
                epatch "${FILESDIR}"/4.9.4/boehm_gc.patch
                epatch "${FILESDIR}"/5.4.0/cilkrts.patch
                epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch

diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild
index 035e93f..257a2d2 100644
--- a/sys-devel/gcc/gcc-7.2.0.ebuild
+++ b/sys-devel/gcc/gcc-7.2.0.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 
        epatch "${FILESDIR}"/gcc-7.2.0-pr69728.patch
 
-       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
+       if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
                epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch
                epatch "${FILESDIR}"/7.1.0/posix_memalign.patch
        fi