[gentoo-commits] proj/sci:master commit in: eclass/

["Kacper Kowalik" <xarthisius@gentoo.org>]

commit:     e7bf55e8a83cf631299a2af835a7a61630bfb86b
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 11:57:32 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 11:57:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e7bf55e8

[fortran-2.eclass] tc-has-fortran -> have-valid-fortran, remove some quotes, add checks for openmp support for other compilers

---
 eclass/fortran-2.eclass |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 0eebf3d..dbc0c2d 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -26,8 +26,8 @@ inherit toolchain-funcs
 DEPEND="virtual/fortran"
 RDEPEND="${DEPEND}"
 
-_tc-has-fortran() {
-	local base="${T}/test-tc-fortran"
+_have-valid-fortran() {
+	local base=${T}/test-tc-fortran
 	cat <<-EOF > "${base}.f"
 	      end
 	EOF
@@ -37,26 +37,35 @@ _tc-has-fortran() {
 	return ${ret}
 }
 
-# See if the toolchain gfortran only supports OpenMP.
-_gfortran-has-openmp() {
-	[[ $(tc-getFC) != *gfortran* ]] && return 0
-	local base="${T}/test-fc-openmp"
+# See if the fortran supports OpenMP.
+_fortran-has-openmp() {
+	local flag
+	case "$(tc-getFC)" in
+		*gfortran*|pathf*)
+			flag=-fopenmp ;;
+		ifort)
+			flag=-openmp ;;
+		*)
+			return 0 ;;
+	esac
+	local base=${T}/test-fc-openmp
 	# leave extra leading space to make sure it works on fortran 77 as well
 	cat << EOF > "${base}.f"
        call omp_get_num_threads
        end
 EOF
-	$(tc-getFC "$@") -fopenmp "${base}.f" -o "${base}" >&/dev/null
+	$(tc-getFC "$@") ${flag} "${base}.f" -o "${base}" >&/dev/null
 	local ret=$?
 	rm -f "${base}"*
 	return ${ret}
 }
 
 fortran-2_pkg_setup() {
-	_tc-has-fortran || \
-		 die "Please emerge the current gcc with USE=fortran or export FC defining a working fortran compiler"
+	_have-valid-fortran || \
+		die "Please emerge the current gcc with USE=fortran or export FC defining a working fortran compiler"
 	if [[ ${FCOPENMP} == 1 ]]; then
-		_gfortran-has-openmp || die "Please emerge current gcc with USE=openmp"
+		_fortran-has-openmp || \
+		die "Please emerge current gcc with USE=openmp or export FC with compiler that supports OpenMP"
 	fi
 }