From fda978185cde8189cfe7acf81079a163dcb78a40 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Fri, 7 Sep 2018 09:37:17 -0400 Subject: [PATCH] eclass: autotools - Mark compatible EAPIs and introduce BDEPEND The autotools commands are run on the build host. As such, their packages needs to be in BDEPEND for EAPI 7. Also taking this opportunity to list compatible EAPIs to consider future adjustments. Signed-off-by: Brian Evans --- eclass/autotools.eclass | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 2bc70f7b3c00..9143aa454d0d 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -4,6 +4,7 @@ # @ECLASS: autotools.eclass # @MAINTAINER: # base-system@gentoo.org +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 # @BLURB: Regenerates auto* build scripts # @DESCRIPTION: # This eclass is for safely handling autotooled software packages that need to @@ -25,6 +26,11 @@ fi if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then _AUTOTOOLS_ECLASS=1 +case ${EAPI:-0} in + 0|1|2|3|4|5|6|7) ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; +esac + inherit libtool # @ECLASS-VARIABLE: WANT_AUTOCONF @@ -118,7 +124,10 @@ RDEPEND="" # their own DEPEND string. : ${AUTOTOOLS_AUTO_DEPEND:=yes} if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then - DEPEND=${AUTOTOOLS_DEPEND} + case ${EAPI:-0} in + 0|1|2|3|4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; + 7) BDEPEND=${AUTOTOOLS_DEPEND} ;; + esac fi __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass -- 2.26.2