[gentoo-commits] proj/musl:master commit in: eclass/

[Aric Belsito]

commit:     7116bde1b30f9d0cd1a660c4cb28351c3930add8
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Jan 25 19:48:03 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 19:48:03 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7116bde1

toolchain.eclass: sync with upstream

 eclass/toolchain.eclass | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d3a06ea..df637dc 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -316,7 +316,11 @@ get_gcc_src_uri() {
        elif [[ -n ${PRERELEASE} ]] ; then
                
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2";
        elif [[ -n ${SNAPSHOT} ]] ; then
-               
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2";
+               if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 
|| tc_version_is_at_least 7.2 ; then
+                       
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.xz";
+               else
+                       
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2";
+               fi
        else
                if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 
|| tc_version_is_at_least 7.2 ; then
                        
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz"
@@ -417,7 +421,11 @@ gcc_quick_unpack() {
        elif [[ -n ${PRERELEASE} ]] ; then
                unpack gcc-${PRERELEASE}.tar.bz2
        elif [[ -n ${SNAPSHOT} ]] ; then
-               unpack gcc-${SNAPSHOT}.tar.bz2
+               if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 
|| tc_version_is_at_least 7.2 ; then
+                       unpack gcc-${SNAPSHOT}.tar.xz
+               else
+                       unpack gcc-${SNAPSHOT}.tar.bz2
+               fi
        elif [[ ${PV} != *9999* ]] ; then
                if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 
|| tc_version_is_at_least 7.2 ; then
                        unpack gcc-${GCC_RELEASE_VER}.tar.xz
@@ -993,7 +1001,7 @@ toolchain_src_configure() {
                                        --disable-threads
                                        --without-headers
                                )
-                       elif has_version 
"${CATEGORY}/${needed_libc}[crosscompile_opts_headers-only(-)]" ; then
+                       elif has_version 
"${CATEGORY}/${needed_libc}[headers-only(-)]" ; then
                                confgcc+=(
                                        "${confgcc_no_libc[@]}"
                                        --with-sysroot="${PREFIX}"/${CTARGET}