From: Justin Lecher Date: Wed, 17 Feb 2016 14:05:24 +0000 (+0100) Subject: fortran-2.eclass: Move inherit and EXPORT_FUNCTIONS to top X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6325ab65b65100d9724bdae400354cf5b75729b0;p=gentoo.git fortran-2.eclass: Move inherit and EXPORT_FUNCTIONS to top Signed-off-by: Justin Lecher --- diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 66b81005c5a1..e2f64106ecb4 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -27,6 +27,13 @@ # # FORTRAN_NEED_OPENMP=1 +inherit eutils toolchain-funcs + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + if [[ ! ${_FORTRAN_2_CLASS} ]]; then # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP @@ -56,8 +63,6 @@ if [[ ! ${_FORTRAN_2_CLASS} ]]; then # If unset, we always depend on virtual/fortran. : ${FORTRAN_NEEDED:=always} -inherit eutils toolchain-funcs - for _f_use in ${FORTRAN_NEEDED}; do case ${_f_use} in always) @@ -194,7 +199,7 @@ _fortran_die_msg() { eerror "set FC variable accordingly and take care that the necessary" eerror "fortran dialects are supported." echo - die "Currently no working fortran compiler is available" + die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)" } # @FUNCTION: _fortran_test_function @@ -286,10 +291,5 @@ fortran-2_pkg_setup() { esac } -case ${EAPI:-0} in - 0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;; - *) die "EAPI=${EAPI} is not supported" ;; -esac - _FORTRAN_2_ECLASS=1 fi