* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-10-07 13:10 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-07 13:10 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/07 13:10:27
Modified: ChangeLog fortran-2.eclass
Log:
Depend on virtual/fortran eclass wise, #435250
Revision Changes Path
1.430 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.430&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.430&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.429&r2=1.430
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- ChangeLog 7 Oct 2012 08:29:49 -0000 1.429
+++ ChangeLog 7 Oct 2012 13:10:27 -0000 1.430
@@ -1,10 +1,16 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.429 2012/10/07 08:29:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.430 2012/10/07 13:10:27 jlec Exp $
07 Oct 2012; Michał Górny <mgorny@gentoo.org> boost-utils.eclass:
Fix stupid mistake in boost-utils_get_best_slot().
+ 07 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Depend on virtual/fortran eclass wise, #435250
+
+ 07 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Give some information on selected fortran compilers
+
03 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
virtualx.eclass:
Unbreak EAPI=2 and 3 users of virtualx.eclass, bug #406353
1.8 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.7&r2=1.8
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fortran-2.eclass 7 Oct 2012 12:06:54 -0000 1.7
+++ fortran-2.eclass 7 Oct 2012 13:10:27 -0000 1.8
@@ -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.7 2012/10/07 12:06:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.8 2012/10/07 13:10:27 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -11,8 +11,7 @@
# Test functions provided by Sebastien Fabbro and Kacper Kowalik
# @BLURB: Simplify fortran compiler management
# @DESCRIPTION:
-# If you need a fortran compiler, then you should be inheriting this eclass and
-# adding virtual/fortran to your dependencies.
+# 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
@@ -155,3 +154,6 @@
0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
+
+DEPEND="virtual/fortran"
+RDEPEND="${DEPEND}"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-10-07 13:15 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-07 13:15 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/07 13:15:52
Modified: ChangeLog fortran-2.eclass
Log:
Revert last change to not break packages with optional fortran support
Revision Changes Path
1.431 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.431&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.431&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.430&r2=1.431
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- ChangeLog 7 Oct 2012 13:10:27 -0000 1.430
+++ ChangeLog 7 Oct 2012 13:15:52 -0000 1.431
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.430 2012/10/07 13:10:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.431 2012/10/07 13:15:52 jlec Exp $
+
+ 07 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Revert last change to not break packages with optional fortran support
07 Oct 2012; Michał Górny <mgorny@gentoo.org> boost-utils.eclass:
Fix stupid mistake in boost-utils_get_best_slot().
1.9 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.8&r2=1.9
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortran-2.eclass 7 Oct 2012 13:10:27 -0000 1.8
+++ fortran-2.eclass 7 Oct 2012 13:15:52 -0000 1.9
@@ -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.8 2012/10/07 13:10:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.9 2012/10/07 13:15:52 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -11,7 +11,8 @@
# Test functions provided by Sebastien Fabbro and Kacper Kowalik
# @BLURB: Simplify fortran compiler management
# @DESCRIPTION:
-# If you need a fortran compiler, then you should be inheriting this eclass
+# If you need a fortran compiler, then you should be inheriting this eclass and
+# adding virtual/fortran to your dependencies.
# The eclass tests for working fortran compilers
# and exports the variables FC and F77.
# Optionally, it checks for extended capabilities based on
@@ -154,6 +155,3 @@
0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
-
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-10-07 13:30 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-07 13:30 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/07 13:30:23
Modified: ChangeLog fortran-2.eclass
Log:
Depend on virtual/fortran eclass wise but in an USE=fortran sensitive way, #435250
Revision Changes Path
1.432 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.432&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.432&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.431&r2=1.432
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- ChangeLog 7 Oct 2012 13:15:52 -0000 1.431
+++ ChangeLog 7 Oct 2012 13:30:23 -0000 1.432
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.431 2012/10/07 13:15:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.432 2012/10/07 13:30:23 jlec Exp $
+
+ 07 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Depend on virtual/fortran eclass wise but in an USE=fortran sensitive way,
+ #435250
07 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
Revert last change to not break packages with optional fortran support
1.10 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.9&r2=1.10
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fortran-2.eclass 7 Oct 2012 13:15:52 -0000 1.9
+++ fortran-2.eclass 7 Oct 2012 13:30:23 -0000 1.10
@@ -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.9 2012/10/07 13:15:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.10 2012/10/07 13:30:23 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -33,7 +33,7 @@
# Valid settings are any combination of: 77 90 95 2003
: ${FORTRAN_STANDARD:=77}
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
# @FUNCTION: _write_testsuite
# @INTERNAL
@@ -155,3 +155,11 @@
0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
+
+if in_iuse fortran; then
+ DEPEND="fortran? ( virtual/fortran )"
+else
+ DEPEND="virtual/fortran"
+fi
+
+RDEPEND="${DEPEND}"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-10-16 20:18 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-16 20:18 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/16 20:18:42
Modified: ChangeLog fortran-2.eclass
Log:
Unset FC and F77 if no fortran support is wanted
Revision Changes Path
1.450 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.450&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.450&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.449&r2=1.450
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- ChangeLog 16 Oct 2012 18:31:48 -0000 1.449
+++ ChangeLog 16 Oct 2012 20:18:42 -0000 1.450
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.449 2012/10/16 18:31:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.450 2012/10/16 20:18:42 jlec Exp $
+
+ 16 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Unset FC and F77 if no fortran support is wanted
16 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
Add enhanced DEP support in fortran-2.eclass to easy the usage. Only inherit
1.13 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.12&r2=1.13
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fortran-2.eclass 16 Oct 2012 18:31:48 -0000 1.12
+++ fortran-2.eclass 16 Oct 2012 20:18:42 -0000 1.13
@@ -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.12 2012/10/16 18:31:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.13 2012/10/16 20:18:42 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -175,7 +175,12 @@
break
;;
*)
- use ${_f_use} && _fortran_test_function && break
+ if use ${_f_use}; then
+ _fortran_test_function && break
+ else
+ unset FC
+ unset F77
+ fi
;;
esac
done
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-11-28 12:11 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-11-28 12:11 UTC (permalink / raw
To: gentoo-commits
jlec 12/11/28 12:11:51
Modified: ChangeLog fortran-2.eclass
Log:
Use man page tags
Revision Changes Path
1.527 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.527&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.527&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.526&r2=1.527
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- ChangeLog 27 Nov 2012 17:39:48 -0000 1.526
+++ ChangeLog 28 Nov 2012 12:11:51 -0000 1.527
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.526 2012/11/27 17:39:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.527 2012/11/28 12:11:51 jlec Exp $
+
+ 28 Nov 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Use man page tags
27 Nov 2012; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
Remove ebeep because newer nvidia-drivers have EAPI=4.
1.15 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.14&r2=1.15
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fortran-2.eclass 18 Oct 2012 21:08:57 -0000 1.14
+++ fortran-2.eclass 28 Nov 2012 12:11:51 -0000 1.15
@@ -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.14 2012/10/18 21:08:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.15 2012/11/28 12:11:51 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -20,9 +20,7 @@
# Optionally, it checks for extended capabilities based on
# the variable options selected in the ebuild
# The only phase function exported is fortran-2_pkg_setup.
-#
-# Example:
-#
+# @EXAMPLE:
# FORTRAN_NEEDED="lapack fortran"
#
# inherit fortran-2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2012-11-28 13:03 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-11-28 13:03 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org> 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@gentoo.org> 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" ;;
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2013-03-13 11:03 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2013-03-13 11:03 UTC (permalink / raw
To: gentoo-commits
jlec 13/03/13 11:03:13
Modified: ChangeLog fortran-2.eclass
Log:
Fix fortran-2.eclass for bash-3.2 compatibility, #461544
Revision Changes Path
1.736 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.736&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.736&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.735&r2=1.736
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -r1.735 -r1.736
--- ChangeLog 10 Mar 2013 21:44:00 -0000 1.735
+++ ChangeLog 13 Mar 2013 11:03:12 -0000 1.736
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.735 2013/03/10 21:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.736 2013/03/13 11:03:12 jlec Exp $
+
+ 13 Mar 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Fix fortran-2.eclass for bash-3.2 compatibility, #461544
10 Mar 2013; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
Make the log output redirection much simpler. Fix bash-3.2 compatibility.
1.17 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.16&r2=1.17
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fortran-2.eclass 28 Nov 2012 13:03:30 -0000 1.16
+++ fortran-2.eclass 13 Mar 2013 11:03:12 -0000 1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.16 2012/11/28 13:03:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.17 2013/03/13 11:03:12 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -113,7 +113,7 @@
[[ -f ${fcode} ]] || _fortran_write_testsuite
- ${fcomp} "${fcode}" -o "${fcode}.x" &>> "${T}"/_fortran_compile_test.log
+ ${fcomp} "${fcode}" -o "${fcode}.x" >> "${T}"/_fortran_compile_test.log 2>&1
ret=$?
rm -f "${fcode}.x"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass
@ 2013-07-29 9:53 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2013-07-29 9:53 UTC (permalink / raw
To: gentoo-commits
jlec 13/07/29 09:53:36
Modified: ChangeLog fortran-2.eclass
Log:
Fortran-2.eclass: enhance support for binary packages, #477070
Revision Changes Path
1.902 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.902&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.902&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.901&r2=1.902
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -r1.901 -r1.902
--- ChangeLog 29 Jul 2013 09:50:09 -0000 1.901
+++ ChangeLog 29 Jul 2013 09:53:36 -0000 1.902
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.901 2013/07/29 09:50:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.902 2013/07/29 09:53:36 jlec Exp $
+
+ 29 Jul 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
+ Fortran-2.eclass: enhance support for binary packages, #477070
29 Jul 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Intel-sdp.eclass: Allow single package downloads, custom suffix, full
1.19 eclass/fortran-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fortran-2.eclass?r1=1.18&r2=1.19
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fortran-2.eclass 18 Jul 2013 07:03:33 -0000 1.18
+++ fortran-2.eclass 29 Jul 2013 09:53:36 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.18 2013/07/18 07:03:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.19 2013/07/29 09:53:36 jlec Exp $
# @ECLASS: fortran-2.eclass
# @MAINTAINER:
@@ -168,7 +168,7 @@
# @INTERNAL
# @DESCRIPTION:
# Internal testfunction for working fortran compiler.
-# It is called in fortran-2_pkg_setup
+# It is called in fortran-2_pkg_setup.
_fortran_test_function() {
local dialect
@@ -203,11 +203,11 @@
fi
}
-# @FUNCTION: fortran-2_pkg_setup
+# @FUNCTION: _fortran-2_pkg_setup
+# @INTERNAL
# @DESCRIPTION:
-# Setup functionallity,
-# checks for a valid fortran compiler and optionally for its openmp support.
-fortran-2_pkg_setup() {
+# _The_ fortran-2_pkg_setup() code
+_fortran-2_pkg_setup() {
for _f_use in ${FORTRAN_NEEDED}; do
case ${_f_use} in
always)
@@ -229,7 +229,29 @@
done
}
+
+# @FUNCTION: fortran-2_pkg_setup
+# @DESCRIPTION:
+# Setup functionallity,
+# checks for a valid fortran compiler and optionally for its openmp support.
+fortran-2_pkg_setup() {
+ case ${EAPI:-0} in
+ 0|1|2|3)
+ eqawarn "Support for EAPI < 4 will be removed from the"
+ eqawarn "fortran-2.eclass in until Sep 31. 2013."
+ eqawarn "Please migrate your package to a higher EAPI"
+ eqawarn "or file a bug at https://bugs.gentoo.org"
+ _fortran-2_pkg_setup ;;
+ 4|5)
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _fortran-2_pkg_setup
+ fi
+ ;;
+ esac
+}
+
case ${EAPI:-0} in
0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
+
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-07-29 9:53 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-16 20:18 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog fortran-2.eclass Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2013-07-29 9:53 Justin Lecher (jlec)
2013-03-13 11:03 Justin Lecher (jlec)
2012-11-28 13:03 Justin Lecher (jlec)
2012-11-28 12:11 Justin Lecher (jlec)
2012-10-07 13:30 Justin Lecher (jlec)
2012-10-07 13:15 Justin Lecher (jlec)
2012-10-07 13:10 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox