| 1 |
commit: bb8bb503cc28b1cf57bbc2b8a16b0f735f6e1b3b |
| 2 |
Author: Dave Flogeras <dflogeras2 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Dec 14 22:46:07 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Dec 14 22:46:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb8bb503 |
| 7 |
|
| 8 |
Widen toolchain stanza when cross-compiling for those with -musleabi |
| 9 |
|
| 10 |
sys-devel/gcc/gcc-4.9.4-r100.ebuild | 2 +- |
| 11 |
sys-devel/gcc/gcc-4.9.4-r99.ebuild | 2 +- |
| 12 |
sys-devel/gcc/gcc-5.4.0-r3.ebuild | 2 +- |
| 13 |
sys-devel/gcc/gcc-6.4.0.ebuild | 2 +- |
| 14 |
sys-devel/gcc/gcc-7.2.0.ebuild | 2 +- |
| 15 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/gcc/gcc-4.9.4-r100.ebuild b/sys-devel/gcc/gcc-4.9.4-r100.ebuild |
| 18 |
index a307fbd..8ebef29 100644 |
| 19 |
--- a/sys-devel/gcc/gcc-4.9.4-r100.ebuild |
| 20 |
+++ b/sys-devel/gcc/gcc-4.9.4-r100.ebuild |
| 21 |
@@ -43,7 +43,7 @@ src_prepare() { |
| 22 |
|
| 23 |
toolchain_src_prepare |
| 24 |
|
| 25 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 26 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 27 |
cd "${S}" |
| 28 |
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in |
| 29 |
mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org |
| 30 |
|
| 31 |
diff --git a/sys-devel/gcc/gcc-4.9.4-r99.ebuild b/sys-devel/gcc/gcc-4.9.4-r99.ebuild |
| 32 |
index 4fdb806..a65bc67 100644 |
| 33 |
--- a/sys-devel/gcc/gcc-4.9.4-r99.ebuild |
| 34 |
+++ b/sys-devel/gcc/gcc-4.9.4-r99.ebuild |
| 35 |
@@ -43,7 +43,7 @@ src_prepare() { |
| 36 |
|
| 37 |
toolchain_src_prepare |
| 38 |
|
| 39 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 40 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 41 |
cd "${S}" |
| 42 |
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in |
| 43 |
mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org |
| 44 |
|
| 45 |
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild b/sys-devel/gcc/gcc-5.4.0-r3.ebuild |
| 46 |
index f147ac9..91ec961 100644 |
| 47 |
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild |
| 48 |
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild |
| 49 |
@@ -50,7 +50,7 @@ src_prepare() { |
| 50 |
epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch |
| 51 |
epatch "${FILESDIR}"/${PN}-5.4.0-pr71696-CVE-2016-6131.patch |
| 52 |
|
| 53 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 54 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 55 |
epatch "${FILESDIR}"/4.9.4/gthread.patch |
| 56 |
epatch "${FILESDIR}"/4.9.4/boehm_gc.patch |
| 57 |
epatch "${FILESDIR}"/4.9.4/posix_memalign.patch |
| 58 |
|
| 59 |
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild |
| 60 |
index dd3ca69..b254f9f 100644 |
| 61 |
--- a/sys-devel/gcc/gcc-6.4.0.ebuild |
| 62 |
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild |
| 63 |
@@ -25,7 +25,7 @@ src_prepare() { |
| 64 |
# Upstream Patch |
| 65 |
epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch |
| 66 |
|
| 67 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 68 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 69 |
epatch "${FILESDIR}"/4.9.4/boehm_gc.patch |
| 70 |
epatch "${FILESDIR}"/5.4.0/cilkrts.patch |
| 71 |
epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
| 72 |
|
| 73 |
diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild |
| 74 |
index 035e93f..257a2d2 100644 |
| 75 |
--- a/sys-devel/gcc/gcc-7.2.0.ebuild |
| 76 |
+++ b/sys-devel/gcc/gcc-7.2.0.ebuild |
| 77 |
@@ -25,7 +25,7 @@ src_prepare() { |
| 78 |
|
| 79 |
epatch "${FILESDIR}"/gcc-7.2.0-pr69728.patch |
| 80 |
|
| 81 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 82 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 83 |
epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
| 84 |
epatch "${FILESDIR}"/7.1.0/posix_memalign.patch |
| 85 |
fi |
Archives