eclass/toolchain.eclass: Add .xz variants to snapshot releases
authorMatthias Maier <tamiko@gentoo.org>
Sat, 20 Jan 2018 00:18:26 +0000 (18:18 -0600)
committerMatthias Maier <tamiko@gentoo.org>
Sat, 20 Jan 2018 01:22:57 +0000 (19:22 -0600)
eclass/toolchain.eclass

index c1fe72d935426d61381a0c655153bc3f364f17c4..504fcabdba030e683918df7b82cc6608ebcdf562 100644 (file)
@@ -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