1 |
commit: 6325ab65b65100d9724bdae400354cf5b75729b0 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 17 14:05:24 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 17 14:06:10 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6325ab65 |
7 |
|
8 |
fortran-2.eclass: Move inherit and EXPORT_FUNCTIONS to top |
9 |
|
10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
11 |
|
12 |
eclass/fortran-2.eclass | 16 ++++++++-------- |
13 |
1 file changed, 8 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass |
16 |
index 66b8100..e2f6410 100644 |
17 |
--- a/eclass/fortran-2.eclass |
18 |
+++ b/eclass/fortran-2.eclass |
19 |
@@ -27,6 +27,13 @@ |
20 |
# |
21 |
# FORTRAN_NEED_OPENMP=1 |
22 |
|
23 |
+inherit eutils toolchain-funcs |
24 |
+ |
25 |
+case ${EAPI:-0} in |
26 |
+ 0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;; |
27 |
+ *) die "EAPI=${EAPI} is not supported" ;; |
28 |
+esac |
29 |
+ |
30 |
if [[ ! ${_FORTRAN_2_CLASS} ]]; then |
31 |
|
32 |
# @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP |
33 |
@@ -56,8 +63,6 @@ if [[ ! ${_FORTRAN_2_CLASS} ]]; then |
34 |
# If unset, we always depend on virtual/fortran. |
35 |
: ${FORTRAN_NEEDED:=always} |
36 |
|
37 |
-inherit eutils toolchain-funcs |
38 |
- |
39 |
for _f_use in ${FORTRAN_NEEDED}; do |
40 |
case ${_f_use} in |
41 |
always) |
42 |
@@ -194,7 +199,7 @@ _fortran_die_msg() { |
43 |
eerror "set FC variable accordingly and take care that the necessary" |
44 |
eerror "fortran dialects are supported." |
45 |
echo |
46 |
- die "Currently no working fortran compiler is available" |
47 |
+ die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)" |
48 |
} |
49 |
|
50 |
# @FUNCTION: _fortran_test_function |
51 |
@@ -286,10 +291,5 @@ fortran-2_pkg_setup() { |
52 |
esac |
53 |
} |
54 |
|
55 |
-case ${EAPI:-0} in |
56 |
- 0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;; |
57 |
- *) die "EAPI=${EAPI} is not supported" ;; |
58 |
-esac |
59 |
- |
60 |
_FORTRAN_2_ECLASS=1 |
61 |
fi |