Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 10 Sep 2018 17:10:46
Message-Id: 1536599188.fda978185cde8189cfe7acf81079a163dcb78a40.grknight@gentoo
1 commit: fda978185cde8189cfe7acf81079a163dcb78a40
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 7 13:37:17 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 10 17:06:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda97818
7
8 eclass: autotools - Mark compatible EAPIs and introduce BDEPEND
9
10 The autotools commands are run on the build host.
11 As such, their packages needs to be in BDEPEND for EAPI 7.
12
13 Also taking this opportunity to list compatible EAPIs to consider
14 future adjustments.
15
16 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
17
18 eclass/autotools.eclass | 11 ++++++++++-
19 1 file changed, 10 insertions(+), 1 deletion(-)
20
21 diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
22 index 2bc70f7b3c0..9143aa454d0 100644
23 --- a/eclass/autotools.eclass
24 +++ b/eclass/autotools.eclass
25 @@ -4,6 +4,7 @@
26 # @ECLASS: autotools.eclass
27 # @MAINTAINER:
28 # base-system@g.o
29 +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
30 # @BLURB: Regenerates auto* build scripts
31 # @DESCRIPTION:
32 # This eclass is for safely handling autotooled software packages that need to
33 @@ -25,6 +26,11 @@ fi
34 if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
35 _AUTOTOOLS_ECLASS=1
36
37 +case ${EAPI:-0} in
38 + 0|1|2|3|4|5|6|7) ;;
39 + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
40 +esac
41 +
42 inherit libtool
43
44 # @ECLASS-VARIABLE: WANT_AUTOCONF
45 @@ -118,7 +124,10 @@ RDEPEND=""
46 # their own DEPEND string.
47 : ${AUTOTOOLS_AUTO_DEPEND:=yes}
48 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
49 - DEPEND=${AUTOTOOLS_DEPEND}
50 + case ${EAPI:-0} in
51 + 0|1|2|3|4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
52 + 7) BDEPEND=${AUTOTOOLS_DEPEND} ;;
53 + esac
54 fi
55 __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass