diff options
| author | Nicolas PARLANT <nicolas.parlant@parhuet.fr> | 2025-03-07 16:53:35 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-09-06 22:29:14 +0100 |
| commit | e9e6d8c367fdf02b14f9cb2a59489833975d1445 (patch) | |
| tree | a08aac32f874ae12add7ce0ba2c4d43737c2bc52 | |
| parent | 62a7ada4e17098494b7c91b019ad9c010e0fba13 (diff) | |
| download | gentoo-e9e6d8c367fdf02b14f9cb2a59489833975d1445.tar.gz gentoo-e9e6d8c367fdf02b14f9cb2a59489833975d1445.tar.bz2 gentoo-e9e6d8c367fdf02b14f9cb2a59489833975d1445.zip | |
toolchain.eclass: drop support EAPI 7
should only supports EAPI=8 since rust was introduced in inherit.
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/40954
Closes: https://github.com/gentoo/gentoo/pull/40954
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | eclass/toolchain.eclass | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 9e79d3de9f28..5d7bf2a67547 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -4,7 +4,7 @@ # @ECLASS: toolchain.eclass # @MAINTAINER: # Toolchain Ninjas <toolchain@gentoo.org> -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: Common code for sys-devel/gcc ebuilds # @DESCRIPTION: # Common code for sys-devel/gcc ebuilds (and occasionally GCC forks, like @@ -17,7 +17,7 @@ _TOOLCHAIN_ECLASS=1 RUST_OPTIONAL="1" case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -463,13 +463,8 @@ PDEPEND=">=sys-devel/gcc-config-2.11" # @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 +# Default is xz for EAPI 8+. : "${TOOLCHAIN_PATCH_SUFFIX:=xz}" -else - # Older EAPIs - : "${TOOLCHAIN_PATCH_SUFFIX:=bz2}" -fi # @ECLASS_VARIABLE: TOOLCHAIN_SET_S # @DESCRIPTION: @@ -766,11 +761,10 @@ do_gcc_gentoo_patches() { fi fi - local shopt_save=$(shopt -p nullglob) + local - shopt -s nullglob einfo "Applying musl patches ..." eapply "${WORKDIR}"/musl/{,nocross/}*.patch - ${shopt_save} fi # |