diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-21 19:03:35 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-21 19:03:35 +0000 |
| commit | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (patch) | |
| tree | 15bb76d57cfb8652fd2627a24007e0bb92ec4a99 /eclass | |
| parent | 5b5df25227111ef465caf5c52bcfb66dac3219cd (diff) | |
gentoo resync : 21.01.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41351 -> 41338 bytes | |||
| -rw-r--r-- | eclass/l10n.eclass | 3 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 12 |
3 files changed, 11 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 47f0f2ac95f3..46fdd53fc119 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass index 82f4ab113f52..0b2d287afa7f 100644 --- a/eclass/l10n.eclass +++ b/eclass/l10n.eclass @@ -18,8 +18,7 @@ # @DEFAULT_UNSET # @DESCRIPTION: # Variable listing the locales for which localizations are offered by -# the package. Check profiles/desc/linguas.desc to see if the locales -# are listed there. Add any missing ones there. +# the package. # # Example: PLOCALES="cy de el_GR en_US pt_BR vi zh_CN" 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 |