1 |
commit: 6348971361f4b9dc3432ace5f146b000e9fb0cac |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 1 18:23:05 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 1 18:23:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63489713 |
7 |
|
8 |
toolchain.eclass: canonical variable ordering |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
eclass/toolchain.eclass | 23 ++++++++++++++--------- |
13 |
1 file changed, 14 insertions(+), 9 deletions(-) |
14 |
|
15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
16 |
index 741b6dfbbcc7..495a305ed83e 100644 |
17 |
--- a/eclass/toolchain.eclass |
18 |
+++ b/eclass/toolchain.eclass |
19 |
@@ -7,6 +7,15 @@ |
20 |
# @SUPPORTED_EAPIS: 7 8 |
21 |
# @BLURB: Common code for sys-devel/gcc ebuilds |
22 |
|
23 |
+case ${EAPI} in |
24 |
+ 7) inherit eutils ;; |
25 |
+ 8) ;; |
26 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
27 |
+esac |
28 |
+ |
29 |
+if [[ ! ${_TOOLCHAIN_ECLASS} ]]; then |
30 |
+_TOOLCHAIN_ECLASS=1 |
31 |
+ |
32 |
DESCRIPTION="The GNU Compiler Collection" |
33 |
HOMEPAGE="https://gcc.gnu.org/" |
34 |
|
35 |
@@ -30,15 +39,6 @@ fi |
36 |
|
37 |
FEATURES=${FEATURES/multilib-strict/} |
38 |
|
39 |
-case ${EAPI} in |
40 |
- 7) inherit eutils ;; |
41 |
- 8) ;; |
42 |
- *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
43 |
-esac |
44 |
- |
45 |
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ |
46 |
- src_compile src_test src_install pkg_postinst pkg_postrm |
47 |
- |
48 |
#---->> globals <<---- |
49 |
|
50 |
export CTARGET=${CTARGET:-${CHOST}} |
51 |
@@ -2322,6 +2322,11 @@ toolchain_death_notice() { |
52 |
fi |
53 |
} |
54 |
|
55 |
+fi |
56 |
+ |
57 |
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ |
58 |
+ src_compile src_test src_install pkg_postinst pkg_postrm |
59 |
+ |
60 |
# Note [implicitly enabled flags] |
61 |
# ------------------------------- |
62 |
# Usually configure-based packages handle explicit feature requests |