-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,
I would like to propose changes to fortran.eclass to deal with bug
323555 [1].
Waiting for you comments before pushing to g-dev.
Cheers,
Kacper

[1] https://bugs.gentoo.org/show_bug.cgi?id=323555
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iJwEAQECAAYFAkwvI+IACgkQIiMqcbOVdxRuSQP/cqNQnxm5HG3yEgjMcHeIoRpJ
6ISJC7o07zvuCmPHtFl0g4LnDBrIMmtQv1+nMkqA3eCEs7QOJym8FcWVWJ/yui5r
jbKy/jrnuVazRv+8OXz7KkF47agddaMK9bkFjBGy1T6ZMD0EQCQ+CB/fbtsqgtCB
jYCv0MsdKHPTIu0miE0=
=yGrR
-----END PGP SIGNATURE-----

--- fortran.eclass
+++ fortran.eclass
@@ -5,7 +5,7 @@
 # Author: Danny van Dyk <[email protected]>
 #
 
-inherit eutils autotools
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -50,13 +50,13 @@
        for PROFILE in $@; do
                case ${PROFILE} in
                        gfortran)
-                               if [ -x "$(type -P gfortran 2> /dev/null)" ]; 
then
-                                       AVAILABLE="${AVAILABLE} gfortran"
+                               if [ -n "$(tc-getFC)" ]; then
+                                       AVAILABLE="${AVAILABLE} $(tc-getFC)"
                                fi
                                ;;
                        g77)
-                               if [ -x "$(type -P g77 2> /dev/null)" ]; then
-                                       AVAILABLE="${AVAILABLE} g77"
+                               if [ -n "$(tc-getF77)" ]; then
+                                       AVAILABLE="${AVAILABLE} $(tc-getF77)"
                                fi
                                ;;
                        f2c)
@@ -155,9 +155,9 @@
                # default to gfortran if available, g77 if not
                use debug && echo "MY_FORTRAN: \"${MY_FORTRAN}\""
                if hasq gfortran ${AVAILABLE}; then
-                       MY_FORTRAN=${MY_FORTRAN:=gfortran}
+                       MY_FORTRAN=${MY_FORTRAN:=$(tc-getFC)}
                elif hasq g77 ${AVAILABLE}; then
-                       MY_FORTRAN=${MY_FORTRAN:=g77}
+                       MY_FORTRAN=${MY_FORTRAN:=$(tc-getF77)}
                else
                        # Default to the first valid Fortran compiler
                        for i in ${AVAILABLE}; do
@@ -173,7 +173,7 @@
                fi
 
                case ${MY_FORTRAN} in
-                       gfortran|g77|ifc|ifort|f2c|f95)
+                       $(tc-getFC)|$(tc-getF77)|ifc|ifort|f2c|f95)
                                FORTRANC="${MY_FORTRAN}"
                esac
        fi

Attachment: fortran.diff.sig
Description: PGP signature

Reply via email to