From b00b1b70118106f1a2fb9fb0685cd14c9fd3bd66 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 19 Jan 2018 18:18:26 -0600 Subject: [PATCH] eclass/toolchain.eclass: Add .xz variants to snapshot releases --- eclass/toolchain.eclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index c1fe72d93542..504fcabdba03 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 -- 2.26.2