[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass

[Justin Lecher (jlec)]

jlec        12/11/28 13:03:30

  Modified:             ChangeLog fortran-2.eclass
  Log:
  * Reduce potential clash of function names in global scope
  * Use more manpage tags
  * resort phase functions to the end
  * require at least arguments for _fortran_compile_test()
  * log compile tests

Revision  Changes    Path
1.528                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.528&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.528&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.527&r2=1.528

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- ChangeLog	28 Nov 2012 12:11:51 -0000	1.527
+++ ChangeLog	28 Nov 2012 13:03:30 -0000	1.528
@@ -1,6 +1,13 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.527 2012/11/28 12:11:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.528 2012/11/28 13:03:30 jlec Exp $
+
+  28 Nov 2012; Justin Lecher <jlec@g.o> fortran-2.eclass:
+  * Reduce potential clash of function names in global scope
+  * Use more manpage tags
+  * resort phase functions to the end
+  * require at least arguments for _fortran_compile_test()
+  * log compile tests
 
   28 Nov 2012; Justin Lecher <jlec@g.o> fortran-2.eclass:
   Use man page tags



1.16                 eclass/fortran-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.15&r2=1.16

Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fortran-2.eclass	28 Nov 2012 12:11:51 -0000	1.15
+++ fortran-2.eclass	28 Nov 2012 13:03:30 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.15 2012/11/28 12:11:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.16 2012/11/28 13:03:30 jlec Exp $
 
 # @ECLASS: fortran-2.eclass
 # @MAINTAINER:
@@ -72,11 +72,11 @@
 done
 RDEPEND="${DEPEND}"
 
-# @FUNCTION: _write_testsuite
+# @FUNCTION: _fortran_write_testsuite
 # @INTERNAL
 # @DESCRIPTION:
 # writes fortran test code
-_write_testsuite() {
+_fortran_write_testsuite() {
 	local filebase=${T}/test-fortran
 
 	# f77 code
@@ -96,23 +96,24 @@
 	EOF
 }
 
-# @FUNCTION: _compile_test
+# @FUNCTION: _fortran_compile_test
+# @USAGE: <compiler> [dialect]
 # @INTERNAL
 # @DESCRIPTION:
 # Takes fortran compiler as first argument and dialect as second.
 # Checks whether the passed fortran compiler speaks the fortran dialect
-_compile_test() {
+_fortran_compile_test() {
 	local filebase=${T}/test-fortran
 	local fcomp=${1}
 	local fdia=${2}
 	local fcode=${filebase}.f${fdia}
 	local ret
 
-	[[ $# -eq 0 ]] && die "_compile_test() needs at least one argument"
+	[[ $# -lt 1 ]] && die "_fortran_compile_test() needs at least one arguments"
 
-	[[ -f ${fcode} ]] || _write_testsuite
+	[[ -f ${fcode} ]] || _fortran_write_testsuite
 
-	${fcomp} "${fcode}" -o "${fcode}.x" >&/dev/null
+	${fcomp} "${fcode}" -o "${fcode}.x" &>> "${T}"/_fortran_compile_test.log
 	ret=$?
 
 	rm -f "${fcode}.x"
@@ -120,6 +121,7 @@
 }
 
 # @FUNCTION: _fortran-has-openmp
+# @RETURN: compilers return value
 # @INTERNAL
 # @DESCRIPTION:
 # See if the fortran supports OpenMP.
@@ -136,7 +138,7 @@
 	EOF
 
 	for flag in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
-		${_fc} ${flag} "${fcode}" -o "${fcode}.x" >&/dev/null
+		${_fc} ${flag} "${fcode}" -o "${fcode}.x" &>> "${T}"/_fortran_compile_test.log
 		ret=$?
 		(( ${ret} )) || break
 	done
@@ -145,11 +147,11 @@
 	return ${ret}
 }
 
-# @FUNCTION: _die_msg
+# @FUNCTION: _fortran_die_msg
 # @INTERNAL
 # @DESCRIPTION:
 # Detailed description how to handle fortran support
-_die_msg() {
+_fortran_die_msg() {
 	echo
 	eerror "Please install currently selected gcc version with USE=fortran."
 	eerror "If you intend to use a different compiler then gfortran, please"
@@ -159,31 +161,6 @@
 	die "Currently no working fortran compiler is available"
 }
 
-# @FUNCTION: fortran-2_pkg_setup
-# @DESCRIPTION:
-# Setup functionallity, checks for a valid fortran compiler and optionally for its openmp support.
-fortran-2_pkg_setup() {
-for _f_use in ${FORTRAN_NEEDED}; do
-   case ${_f_use} in
-      always)
-			_fortran_test_function && break
-         ;;
-      no)
-			einfo "Forcing fortran support off"
-			break
-         ;;
-      *)
-			if use ${_f_use}; then
-				_fortran_test_function && break
-			else
-				unset FC
-				unset F77
-			fi
-         ;;
-   esac
-done
-}
-
 # @FUNCTION: _fortran_test_function
 # @INTERNAL
 # @DESCRIPTION:
@@ -196,9 +173,9 @@
 	: ${FORTRAN_STANDARD:=77}
 	for dialect in ${FORTRAN_STANDARD}; do
 		case ${dialect} in
-			77) _compile_test $(tc-getF77) || _die_msg ;;
-			90|95) _compile_test $(tc-getFC) 90 || _die_msg ;;
-			2003) _compile_test $(tc-getFC) 03 || _die_msg ;;
+			77) _fortran_compile_test $(tc-getF77) || _fortran_die_msg ;;
+			90|95) _fortran_compile_test $(tc-getFC) 90 || _fortran_die_msg ;;
+			2003) _fortran_compile_test $(tc-getFC) 03 || _fortran_die_msg ;;
 			2008) die "Future" ;;
 			*) die "${dialect} is not a Fortran dialect." ;;
 		esac
@@ -218,6 +195,31 @@
 	fi
 }
 
+# @FUNCTION: fortran-2_pkg_setup
+# @DESCRIPTION:
+# Setup functionallity, checks for a valid fortran compiler and optionally for its openmp support.
+fortran-2_pkg_setup() {
+	for _f_use in ${FORTRAN_NEEDED}; do
+   	case ${_f_use} in
+      	always)
+				_fortran_test_function && break
+	         ;;
+   	   no)
+				einfo "Forcing fortran support off"
+				break
+	         ;;
+   	   *)
+				if use ${_f_use}; then
+					_fortran_test_function && break
+				else
+					unset FC
+					unset F77
+				fi
+   	      ;;
+	   esac
+	done
+}
+
 case ${EAPI:-0} in
 	0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
 	*) die "EAPI=${EAPI} is not supported" ;;