diff options
author | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:38 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:38 +0200 |
commit | c7082538536c5fceab8d67da2365a938391c0d94 (patch) | |
tree | 850359d81881b1763b1c63ccd19651d750393d52 /eclass | |
parent | toolchain-funcs.eclass: drop support for EAPI 6 (diff) | |
download | gentoo-c7082538536c5fceab8d67da2365a938391c0d94.tar.gz gentoo-c7082538536c5fceab8d67da2365a938391c0d94.tar.bz2 gentoo-c7082538536c5fceab8d67da2365a938391c0d94.zip |
toolchain.eclass: drop support for EAPI 6
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 34f595bcd1bc..6bad1def19f4 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -11,14 +11,14 @@ # GNAT for Ada). If not building GCC itself, please use toolchain-funcs.eclass # instead. +if [[ -z ${_TOOLCHAIN_ECLASS} ]]; then +_TOOLCHAIN_ECLASS=1 + case ${EAPI} in 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_TOOLCHAIN_ECLASS} ]]; then -_TOOLCHAIN_ECLASS=1 - DESCRIPTION="The GNU Compiler Collection" HOMEPAGE="https://gcc.gnu.org/" @@ -2647,7 +2647,7 @@ fix_libtool_libdir_paths() { pushd "${D}" >/dev/null || die pushd "./${libpath}" >/dev/null || die - local dir="${PWD#${D%/}}" + local dir="${PWD#${D}}" local allarchives=$(echo *.la) allarchives="\(${allarchives// /\\|}\)" popd >/dev/null || die |