toolchain.eclass: introduce TOOLCHAIN_PATCH_SUFFIX
Apologies for the churn here. It's turned out to be easier to just do this based on EAPI and override in ebuilds if needed. I won't plan to change this again. Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
parent
f7464e12fa
commit
a079e35c76
|
|
@ -316,6 +316,17 @@ PDEPEND=">=sys-devel/gcc-config-2.3"
|
|||
|
||||
#---->> S + SRC_URI essentials <<----
|
||||
|
||||
# @ECLASS_VARIABLE: TOOLCHAIN_PATCH_SUFFIX
|
||||
# @DESCRIPTION:
|
||||
# Used to override compression used for for patchsets.
|
||||
# Default is xz for EAPI 8+ and bz2 for older EAPIs.
|
||||
if [[ ${EAPI} == 8 ]] ; then
|
||||
: ${TOOLCHAIN_PATCH_SUFFIX:=xz}
|
||||
else
|
||||
# Older EAPIs
|
||||
: ${TOOLCHAIN_PATCH_SUFFIX:=bz2}
|
||||
fi
|
||||
|
||||
# @ECLASS_VARIABLE: TOOLCHAIN_SET_S
|
||||
# @DESCRIPTION:
|
||||
# Used to override value of S for snapshots and such. Mainly useful
|
||||
|
|
@ -428,25 +439,18 @@ get_gcc_src_uri() {
|
|||
fi
|
||||
fi
|
||||
|
||||
local PATCH_SUFFIX="xz"
|
||||
if ! tc_version_is_at_least 10 || tc_version_is_between 10 10.4 \
|
||||
|| tc_version_is_between 11 11.4 || tc_version_is_between 12 12.0.1_pre20220424 ; then
|
||||
# These are versions before we started to use .xz
|
||||
PATCH_SUFFIX="bz2"
|
||||
fi
|
||||
|
||||
[[ -n ${PATCH_VER} ]] && \
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.${PATCH_SUFFIX})"
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.${TOOLCHAIN_PATCH_SUFFIX})"
|
||||
[[ -n ${MUSL_VER} ]] && \
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${MUSL_GCC_VER}-musl-patches-${MUSL_VER}.tar.${PATCH_SUFFIX})"
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${MUSL_GCC_VER}-musl-patches-${MUSL_VER}.tar.${TOOLCHAIN_PATCH_SUFFIX})"
|
||||
|
||||
[[ -n ${PIE_VER} ]] && \
|
||||
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.${PATCH_SUFFIX}} && \
|
||||
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.${TOOLCHAIN_PATCH_SUFFIX}} && \
|
||||
GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
|
||||
|
||||
# gcc minispec for the hardened gcc 4 compiler
|
||||
[[ -n ${SPECS_VER} ]] && \
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.${PATCH_SUFFIX})"
|
||||
GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.${TOOLCHAIN_PATCH_SUFFIX})"
|
||||
|
||||
if tc_has_feature gcj ; then
|
||||
if tc_version_is_at_least 4.5 ; then
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa26
|
|||
DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
|
||||
DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
|
||||
DIST gcc-11.3.0-musl-patches-1.tar.bz2 3997 BLAKE2B 5ca064cc78b067f4a7822fa0341c37ae03c8024f871d2e274e481a583afa96c36e291be93fbdd633f203260ae2ea9ac1d45f666d134bac75bc9a715a369d7374 SHA512 0ab239c66cf62a737266377c19b8dda6af6df56380f6731c2c17f3e82778e7e023a68d31728490eea3ad946f4b71d4cab363a75548f74b4b7f653972469d9e91
|
||||
DIST gcc-11.3.0-musl-patches-1.tar.xz 3768 BLAKE2B c591bc66f9d2e97d1b2450001dda15e9fc5b9b933cb52661815dd4a12db7973adb8d05b42a9c90badc29f06be690d98fc7fdeb3f3177497241560ed1211835ab SHA512 ca7b1e2351b2b6b4dbc19a04ca79e37d229498b3e61715e9c72abc83357dce056b37c4a31fe92497a37eb4ffbfebf13d38c2cfda81b97c1b825f99a692cd6d31
|
||||
DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
|
||||
DIST gcc-11.3.0-patches-4.tar.xz 13304 BLAKE2B 2b529c5005133acd41bcc013d134fccb1011a3dea9565537ef9c7aa229005831d298fa1f8ece62ae402a0c0db174ae3851461e47140375d3dd20cebb9e6163ec SHA512 4c0b3f057d895bd8882edb21d14a5fd126c8174969fbc7a4664c62abc8f2f19ca50389295e55ea78694d4720e577464b1a3bb53a0bfb39105b50f08e0a52afe3
|
||||
DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
|
||||
DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B 4664cd6a4c1caa22b8a70191861d5ca7df4eff546fc798d594a55f25783e16f803468e9c5db553341aa6c5c6ac35ec60794e9175312554958b3cdc892a7f8575 SHA512 523ae1c2d3d14fc707348fdc60cdabf95aff208748cc870eb0bb76b970dc0b822d7e605706c77fb0fb6162a8b0e562924dd46bd7c7edfeabecae6f31b16ccc51
|
||||
DIST gcc-11.4.0-patches-0.tar.xz 13240 BLAKE2B 2281ad12ab96579e376c2e89a6b829812d35a849bffa6c1f3b79eae119a4a60673690b4fde52a88421d682946193a5ccc48e87d09fe31e06144d6cadb4ec3cfe SHA512 ace15d5f79918d4c11db864493106e56295b7ac0696d6a565ce07cc44c3cacdde501317b347bf0b710560669e93b9f950e7eed0f33fc39f120edaeaa03efbe3e
|
||||
DIST gcc-12-20220514.tar.xz 79083160 BLAKE2B aeb6002f1137413564d24e65f4e6c79f8c2e12225ecaaf1cee601f4a584f3778b6cfc98b519d731ccf811075a7ec3e469128dd8a5e1885f480261b08c03c7a47 SHA512 15af7d5dcddd91bda7db7855956ba85983d95c63a6193785f4c5e8827f120352c731b9652d814bc461aecb9ae8b609689b500e6c8265594b31e5ec962256bee0
|
||||
DIST gcc-12-20220521.tar.xz 79087572 BLAKE2B 835b5b28c9e29fc3ab94ee732188325f216b4b54285a62c602280d2c3b0bcaaf779d2874402268b49a0aa57f0a23783e0b71fa4e37c1da05eedb5aa91f782ef3 SHA512 92f6c7cbe3b301ed7361c097dd37e11df8d504bcb0c62a363d710eb09091248a43db3466ae6d61042ce3733714efb81eec80f2e50d8761fc7a742be2c8bb5f53
|
||||
DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70d96e7e20f6720664cd94573b1c6cd079a0e29f73277c27b2f2570706da5239006dabd44f834824c515f6615ed5dc39c273f SHA512 cf917f40133d2b8090e98880e6c87d38129f44bcb454f4d707ef57967635a6fb571d7b85b7cb854421bc9aa88e48767a47aad99c767f9415899f97922d61c497
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@
|
|||
|
||||
EAPI=7
|
||||
|
||||
PATCH_VER="4"
|
||||
PATCH_GCC_VER="11.3.0"
|
||||
MUSL_VER="1"
|
||||
MUSL_GCC_VER="11.3.0"
|
||||
TOOLCHAIN_PATCH_SUFFIX="xz"
|
||||
PATCH_VER="0"
|
||||
PATCH_GCC_VER="11.4.0"
|
||||
MUSL_VER="0"
|
||||
MUSL_GCC_VER="11.4.0"
|
||||
|
||||
if [[ $(ver_cut 3) == 9999 ]] ; then
|
||||
MY_PV_2=$(ver_cut 2)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
PATCH_VER="5"
|
||||
PATCH_GCC_VER="12.0.0"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
PATCH_VER="5"
|
||||
PATCH_GCC_VER="12.0.0"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
PATCH_VER="5"
|
||||
PATCH_GCC_VER="12.0.0"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
PATCH_VER="5"
|
||||
PATCH_GCC_VER="12.0.0"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
|
||||
EAPI=7
|
||||
|
||||
TOOLCHAIN_GCC_PV=13.0.0
|
||||
|
||||
TOOLCHAIN_PATCH_SUFFIX="xz"
|
||||
PATCH_VER="5"
|
||||
PATCH_GCC_VER="12.0.0"
|
||||
MUSL_VER="4"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
EAPI=7
|
||||
|
||||
PATCH_GCC_VER="9.4.0"
|
||||
PATCH_VER="1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue