summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-10-16 20:18:42 +0000
committerJustin Lecher <jlec@gentoo.org>2012-10-16 20:18:42 +0000
commit945d888f2ea2ce742e27a34571b6678312c9b8ce (patch)
treeb272712fb2bd7145b1143e45aa339634a837f26b
parentsci-libs/punc: Remove virtual/fortran and always call fortran-2_pkg_setup as ... (diff)
downloadgentoo-2-945d888f2ea2ce742e27a34571b6678312c9b8ce.tar.gz
gentoo-2-945d888f2ea2ce742e27a34571b6678312c9b8ce.tar.bz2
gentoo-2-945d888f2ea2ce742e27a34571b6678312c9b8ce.zip
Unset FC and F77 if no fortran support is wanted
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/fortran-2.eclass9
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 78a1787f1c7c..20f6a2168dc2 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -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
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 059dbff0510f..6e608c349e09 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -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 @@ for _f_use in ${FORTRAN_NEEDED}; do
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