Signed-off-by: David Michael <fedora....@gmail.com> --- Hi,
Here is a simple update that is blocking a lot of stuff. It moves the EAPI check outside the inherit guard for bash future-proofing. Thanks. David eclass/autotools.eclass | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index b386654c832..214c90d06f9 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -4,7 +4,7 @@ # @ECLASS: autotools.eclass # @MAINTAINER: # base-sys...@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Regenerates auto* build scripts # @DESCRIPTION: # This eclass is for safely handling autotooled software packages that need to @@ -23,18 +23,15 @@ if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then fi fi -if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then -_AUTOTOOLS_ECLASS=1 - case ${EAPI} in - 5|6) - # Needed for eqawarn - inherit eutils - ;; - 7) ;; - *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; + 5|6) inherit eutils ;; # Needed for eqawarn + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then +_AUTOTOOLS_ECLASS=1 + inherit gnuconfig libtool # @ECLASS-VARIABLE: WANT_AUTOCONF @@ -119,7 +116,6 @@ fi AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}" -RDEPEND="" # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND # @PRE_INHERIT @@ -131,7 +127,7 @@ RDEPEND="" if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then case ${EAPI} in 5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; - 7) BDEPEND=${AUTOTOOLS_DEPEND} ;; + *) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass @@ -490,7 +486,7 @@ autotools_env_setup() { 5|6) hv_args="--host-root" ;; - 7) + *) hv_args="-b" ;; esac -- 2.31.1