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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: eclass/
Date: Mon, 20 Jun 2011 05:20:30 +0000 (UTC)	[thread overview]
Message-ID: <f6c799d92e58dc170ef057ad73e44ef5db3e4f16.jlec@gentoo> (raw)

commit:     f6c799d92e58dc170ef057ad73e44ef5db3e4f16
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 14:53:07 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:53:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f6c799d9

Mikes suggestions

---
 eclass/fortran-2.eclass |   89 +++++++++++++++++++++++------------------------
 1 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index b812f50..600d107 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -9,40 +9,37 @@
 # @MAINTAINER:
 # jlec@gentoo.org
 # sci@gentoo.org
-# @BLURB: Packages, which need a fortran compiler should inherit this eclass.
+# @BLURB: Simplify fortran compiler management
 # @DESCRIPTION:
-# If you need a fortran compiler, inherit this eclass. This eclass tests for
-# working fortran compilers and exports the variables FC and F77.
-# Optional, it checks for openmp capability of the
-# current fortran compiler through FORTRAN_NEED_OPENMP=1.
-# Only phase function exported is pkg_pretend and pkg_setup.
-# Need help? Ask the sci team.
+# If you need a fortran compiler, then you should be inheriting this eclass.
+# The eclass tests for working fortran compilers
+# and exports the variables FC and F77.
+# Optionally, it checks for extended capabilities based on
+# the variable options selected in the ebuild
+# The only phase functions exported are pkg_pretend and pkg_setup.
 
 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
 # @DESCRIPTION:
-# Set FORTRAN_NEED_OPENMP=1 in order to test FC for openmp capabilities
-#
-# Default is 0
+# Set to "1" in order to automatically have the eclass abort if the fortran
+# compiler lacks openmp support.
+: ${FORTRAN_NEED_OPENMP:=0}
 
 # @ECLASS-VARIABLE: FORTRAN_STANDARD
 # @DESCRIPTION:
-# Set this, if a special dialect needs to be support. Generally not needed.
-#
-# Valid settings are any combination of
-#
-# FORTRAN_STANDARD="77 90 95 2003"
+# Set this, if a special dialect needs to be supported.
+# Generally not needed as default is sufficient.
 #
-# Defaults to FORTRAN_STANDARD="77" which is sufficient for most cases.
+# Valid settings are any combination of: 77 90 95 2003
+: ${FORTRAN_STANDARD:=77}
 
 inherit toolchain-funcs
 
 DEPEND="virtual/fortran"
 RDEPEND="${DEPEND}"
 
-# internal function
-#
-# FUNCTION: _write_testsuite
-# DESCRIPTION: writes fortran test code
+# @FUNCTION: _write_testsuite
+# @DESCRIPTION: writes fortran test code
+# @INTERNAL
 _write_testsuite() {
 	local filebase=${T}/test-fortran
 
@@ -63,56 +60,58 @@ _write_testsuite() {
 	EOF
 }
 
-# internal function
-#
-# FUNCTION: _compile_test
-# DESCRIPTION:
+# @FUNCTION: _compile_test
+# @DESCRIPTION:
 # Takes fortran compiler as first argument and dialect as second.
 # Checks whether the passed fortran compiler speaks the fortran dialect
+# @INTERNAL
 _compile_test() {
 	local filebase=${T}/test-fortran
 	local fcomp=${1}
 	local fdia=${2}
+	local fcode=${filebase}.f${fdia}
+	local ret
 
-	[[ -z ${fcomp} ]] && die "_compile_test() needs at least one argument"
+	[[ $# -eq 0 ]] && die "_compile_test() needs at least one argument"
 
-	[[ -f "${filebase}.f${fdia}" ]] || _write_testsuite
+	[[ -f ${fcode} ]] || _write_testsuite
 
-	${fcomp} "${filebase}.f${fdia}" -o "${filebase}-f${fdia}" >&/dev/null
-	local ret=$?
+	${fcomp} "${fcode}" -o "${fcode}.x" >&/dev/null
+	ret=$?
 
-	rm -f "${filebase}-f${fdia}"
+	rm -f "${fcode}.x"
 	return ${ret}
 }
 
-# internal function
-#
-# FUNCTION: _fortran-has-openmp
-# DESCRIPTION:
+# @FUNCTION: _fortran-has-openmp
+# @DESCRIPTION:
 # See if the fortran supports OpenMP.
+# @INTERNAL
 _fortran-has-openmp() {
 	local flag
 	local filebase=${T}/test-fc-openmp
+	local fcode=${filebase}.f
+	local ret
+	local _fc=$(tc-getFC)
 
-	cat <<- EOF > "${filebase}.f"
+	cat <<- EOF > "${fcode}"
 	       call omp_get_num_threads
 	       end
 	EOF
 
 	for flag in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
-		$(tc-getFC "$@") ${flag} "${filebase}.f" -o "${filebase}" >&/dev/null
-		local ret=$?
+		${_fc} ${flag} "${fcode}" -o "${fcode}.x" >&/dev/null
+		ret=$?
 		(( ${ret} )) || break
 	done
 
-	rm -f "${filebase}"*
+	rm -f "${fcode}.x"
 	return ${ret}
 }
 
-# internal
-#
-# FUNCTION: _die_msg
-# DESCRIPTION: Detailed description how to handle fortran support
+# @FUNCTION: _die_msg
+# @DESCRIPTION: Detailed description how to handle fortran support
+# @INTERNAL
 _die_msg() {
 	echo
 	eerror "Please install currently selected gcc version with USE=fortran."
@@ -129,7 +128,7 @@ _die_msg() {
 fortran-2_pkg_pretend() {
 	local dialect
 
-	[[ -n ${F77} ]] || F77=$(tc-getFC)
+	: ${F77:=$(tc-getFC)}
 
 	: ${FORTRAN_STANDARD:=77}
 	for dialect in ${FORTRAN_STANDARD}; do
@@ -151,13 +150,13 @@ fortran-2_pkg_pretend() {
 # @FUNCTION: fortran-2_pkg_setup
 # @DESCRIPTION:
 # In EAPI < 4 it calls the compiler check. This behavior is deprecated
-# and will be removed at 01-Sep-2011. Please migrate to EAPI=4.
+# and will be removed at 01-Okt-2011. Please migrate to EAPI=4.
 #
 # Exports the FC and F77 variable according to the compiler checks.
 fortran-2_pkg_setup() {
 	if has ${EAPI:-0} 0 1 2 3; then
 		ewarn "The support for EAPI=${EAPI} by the fortran-2.eclass"
-		ewarn "will be end at 01-Sep-2011"
+		ewarn "will be end at 01-Okt-2011"
 		ewarn "Please migrate your package to EAPI=4"
 		fortran-2_pkg_pretend
 	fi
@@ -165,7 +164,7 @@ fortran-2_pkg_setup() {
 	[[ -n ${FC} ]] || export FC=$(tc-getFC)
 }
 
-case "${EAPI:-0}" in
+case ${EAPI:-0} in
 	1|2|3) EXPORT_FUNCTIONS pkg_setup ;;
 	4) EXPORT_FUNCTIONS pkg_pretend pkg_setup ;;
 	*) die "EAPI=${EAPI} is not supported" ;;

next             reply	other threads:[~2011-06-20  5:20 UTC|newest]

Thread overview: 169+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-20  5:20 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-30 15:24 [gentoo-commits] proj/sci:master commit in: eclass/ Andrew Ammerlaan
2021-01-30 10:04 Andrew Ammerlaan
2021-01-19 17:02 Andrew Ammerlaan
2020-12-19 21:38 Aisha Tammy
2020-12-19 21:36 Aisha Tammy
2020-10-01  1:43 Aisha Tammy
2018-10-28  6:21 Justin Lecher
2018-08-31  3:04 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-04-02 11:20 Justin Lecher
2018-01-27 20:29 [gentoo-commits] proj/sci:jlec/scilab " Justin Lecher
2018-01-27 20:28 ` [gentoo-commits] proj/sci:master " Justin Lecher
2017-12-25 20:33 Justin Lecher
2017-08-29 13:52 Benda XU
2017-08-25  6:10 Benda XU
2017-08-23  3:15 Benda XU
2017-06-06  4:12 Benda XU
2017-04-30  7:47 Justin Lecher
2017-03-07  7:45 Marius Brehler
2017-02-24 14:14 Marius Brehler
2017-02-24 13:59 Marius Brehler
2016-12-10 10:51 Justin Lecher
2016-08-29 20:45 Justin Bronder
2016-07-31 21:13 Justin Lecher
2016-02-22 13:25 Justin Lecher
2016-02-19 10:12 Justin Lecher
2016-02-15  8:19 Justin Lecher
2016-02-15  8:19 Justin Lecher
2016-02-10 18:27 Justin Lecher
2016-02-10 18:27 Justin Lecher
2016-02-10 18:27 Justin Lecher
2016-02-10 18:27 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-12-14  7:53 Justin Lecher
2015-12-04  7:01 Justin Lecher
2015-12-03 10:03 Justin Lecher
2015-11-29 10:17 Justin Lecher
2015-11-29 10:17 Justin Lecher
2015-11-29 10:17 Justin Lecher
2015-11-29 10:17 Justin Lecher
2015-11-29 10:17 Justin Lecher
2015-11-28 18:59 Justin Lecher
2015-08-20 23:29 Christoph Junghans
2015-05-24  8:14 Justin Lecher
2015-03-28 18:29 Justin Lecher
2015-03-28 16:41 Justin Lecher
2015-02-21 10:01 Justin Lecher
2015-02-18  9:06 Justin Lecher
2015-02-05  8:01 Justin Lecher
2015-01-26  7:19 Justin Lecher
2015-01-10 13:35 Justin Lecher
2014-12-02 15:36 Justin Lecher
2014-12-02 15:36 Justin Lecher
2014-12-02 15:36 Justin Lecher
2014-09-15 12:01 Justin Lecher
2014-05-26  7:07 Justin Lecher
2014-05-23  9:14 Justin Lecher
2014-01-22 10:11 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-22 10:09 Reinis Danne
2014-01-21 19:38 Reinis Danne
2014-01-04 18:11 Justin Lecher
2013-11-26  5:28 Sebastien Fabbro
2013-11-26  5:28 Sebastien Fabbro
2013-07-24  9:17 Justin Lecher
2013-07-24  9:17 Justin Lecher
2013-07-22 13:14 Justin Lecher
2013-07-19 18:27 Alexey Shvetsov
2013-07-09  1:17 Justin Bronder
2013-07-02  2:15 Justin Bronder
2013-07-02  0:09 Justin Bronder
2013-02-14 16:32 Denis Dupeyron
2013-02-14 16:32 Denis Dupeyron
2013-01-24 19:47 Sebastien Fabbro
2013-01-15 15:27 Justin Lecher
2013-01-11 20:45 Justin Bronder
2012-11-30  3:31 Christoph Junghans
2012-11-29 21:05 Justin Lecher
2012-11-29 21:05 Justin Lecher
2012-11-29  7:03 Justin Lecher
2012-11-29  7:03 Justin Lecher
2012-11-29  7:03 Justin Lecher
2012-11-29  7:03 Justin Lecher
2012-11-28  7:22 Justin Lecher
2012-11-28  5:29 Christoph Junghans
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-27 19:33 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-02 19:54 Justin Lecher
2012-11-02 19:46 Justin Lecher
2012-11-02 19:43 Justin Lecher
2012-10-04 14:39 Christoph Junghans
2012-09-20 12:45 Justin Lecher
2012-08-30  8:38 Justin Lecher
2012-08-09  5:15 Christoph Junghans
2012-07-27 22:10 Sebastien Fabbro
2012-04-27 11:42 Justin Lecher
2012-04-27 11:42 Justin Lecher
2012-02-16 22:35 Sebastien Fabbro
2012-01-31 18:15 Sebastien Fabbro
2011-10-25 17:16 Justin Lecher
2011-10-23 21:53 Justin Lecher
2011-10-23 21:53 Justin Lecher
2011-10-05  7:54 Justin Lecher
2011-08-03 23:55 Andrea Arteaga
2011-07-18  9:09 Andreas Hüttel
2011-07-17 19:55 Andreas Hüttel
2011-07-17 18:26 Andreas Hüttel
2011-07-17 18:02 Andreas Hüttel
2011-07-17 17:53 Andreas Hüttel
2011-07-17 17:03 Andreas Hüttel
2011-07-17 17:03 Andreas Hüttel
2011-06-30 16:57 Alexey Shvetsov
2011-06-30 16:47 Alexey Shvetsov
2011-06-30 16:45 Alexey Shvetsov
2011-06-21 11:54 Justin Lecher
2011-06-20  5:20 Justin Lecher
2011-06-15 21:30 Justin Lecher
2011-06-15 20:50 Justin Lecher
2011-06-15  6:32 Justin Lecher
2011-06-13 10:27 Justin Lecher
2011-06-13  8:29 Kacper Kowalik
2011-06-13  8:20 Justin Lecher
2011-06-12 15:09 Kacper Kowalik
2011-06-12 14:52 Kacper Kowalik
2011-06-12 14:39 Justin Lecher
2011-06-12 13:41 Justin Lecher
2011-06-12 12:16 Justin Lecher
2011-06-12 11:57 Kacper Kowalik
2011-06-12 11:24 Kacper Kowalik
2011-06-12 10:53 Justin Lecher
2011-05-19  5:56 Justin Lecher
2011-04-04 11:18 Justin Lecher
2011-03-22  6:58 Justin Lecher
2011-03-20 16:28 Justin Lecher
2011-03-15 10:24 Justin Lecher
2011-03-15  7:25 Justin Lecher
2011-03-15  7:16 Justin Lecher
2011-03-14  9:25 Justin Lecher
2011-03-10 19:00 Justin Lecher
2011-03-10 19:00 Justin Lecher
2011-03-10 19:00 Justin Lecher

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b812f50 dfblob:600d107 )
 OR (
bs:"[gentoo-commits] proj/sci:master commit in: eclass/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f6c799d92e58dc170ef057ad73e44ef5db3e4f16.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox