| 1 |
commit: 7116bde1b30f9d0cd1a660c4cb28351c3930add8 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 25 19:48:03 2018 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Jan 25 19:48:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7116bde1 |
| 7 |
|
| 8 |
toolchain.eclass: sync with upstream |
| 9 |
|
| 10 |
eclass/toolchain.eclass | 14 +++++++++++--- |
| 11 |
1 file changed, 11 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 14 |
index d3a06ea..df637dc 100644 |
| 15 |
--- a/eclass/toolchain.eclass |
| 16 |
+++ b/eclass/toolchain.eclass |
| 17 |
@@ -316,7 +316,11 @@ get_gcc_src_uri() { |
| 18 |
elif [[ -n ${PRERELEASE} ]] ; then |
| 19 |
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2" |
| 20 |
elif [[ -n ${SNAPSHOT} ]] ; then |
| 21 |
- GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2" |
| 22 |
+ if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then |
| 23 |
+ GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.xz" |
| 24 |
+ else |
| 25 |
+ GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2" |
| 26 |
+ fi |
| 27 |
else |
| 28 |
if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then |
| 29 |
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz" |
| 30 |
@@ -417,7 +421,11 @@ gcc_quick_unpack() { |
| 31 |
elif [[ -n ${PRERELEASE} ]] ; then |
| 32 |
unpack gcc-${PRERELEASE}.tar.bz2 |
| 33 |
elif [[ -n ${SNAPSHOT} ]] ; then |
| 34 |
- unpack gcc-${SNAPSHOT}.tar.bz2 |
| 35 |
+ if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then |
| 36 |
+ unpack gcc-${SNAPSHOT}.tar.xz |
| 37 |
+ else |
| 38 |
+ unpack gcc-${SNAPSHOT}.tar.bz2 |
| 39 |
+ fi |
| 40 |
elif [[ ${PV} != *9999* ]] ; then |
| 41 |
if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then |
| 42 |
unpack gcc-${GCC_RELEASE_VER}.tar.xz |
| 43 |
@@ -993,7 +1001,7 @@ toolchain_src_configure() { |
| 44 |
--disable-threads |
| 45 |
--without-headers |
| 46 |
) |
| 47 |
- elif has_version "${CATEGORY}/${needed_libc}[crosscompile_opts_headers-only(-)]" ; then |
| 48 |
+ elif has_version "${CATEGORY}/${needed_libc}[headers-only(-)]" ; then |
| 49 |
confgcc+=( |
| 50 |
"${confgcc_no_libc[@]}" |
| 51 |
--with-sysroot="${PREFIX}"/${CTARGET} |
Archives