| 1 |
commit: 9187b3174d1c221800e4afbf4df0ff7072ade139 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 3 19:44:21 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 3 20:26:58 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9187b317 |
| 7 |
|
| 8 |
toolchain.eclass: upstream now uses .xz compressed tarballs |
| 9 |
|
| 10 |
eclass/toolchain.eclass | 12 ++++++++++-- |
| 11 |
1 file changed, 10 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 14 |
index db6e643148c..ae2db7f0a44 100644 |
| 15 |
--- a/eclass/toolchain.eclass |
| 16 |
+++ b/eclass/toolchain.eclass |
| 17 |
@@ -320,7 +320,11 @@ get_gcc_src_uri() { |
| 18 |
elif [[ -n ${SNAPSHOT} ]] ; then |
| 19 |
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2" |
| 20 |
else |
| 21 |
- GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.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="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz" |
| 24 |
+ else |
| 25 |
+ GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2" |
| 26 |
+ fi |
| 27 |
# we want all branch updates to be against the main release |
| 28 |
[[ -n ${BRANCH_UPDATE} ]] && \ |
| 29 |
GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)" |
| 30 |
@@ -424,7 +428,11 @@ gcc_quick_unpack() { |
| 31 |
elif [[ -n ${SNAPSHOT} ]] ; then |
| 32 |
unpack gcc-${SNAPSHOT}.tar.bz2 |
| 33 |
elif [[ ${PV} != *9999* ]] ; then |
| 34 |
- unpack gcc-${GCC_RELEASE_VER}.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-${GCC_RELEASE_VER}.tar.xz |
| 37 |
+ else |
| 38 |
+ unpack gcc-${GCC_RELEASE_VER}.tar.bz2 |
| 39 |
+ fi |
| 40 |
# We want branch updates to be against a release tarball |
| 41 |
if [[ -n ${BRANCH_UPDATE} ]] ; then |
| 42 |
pushd "${S}" > /dev/null |
Archives