diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-12-19 18:23:16 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-12-19 18:23:16 +0000 |
| commit | 654150ba3a8cc964ac9ac98bde086e712119752a (patch) | |
| tree | 864d6c8670b85b180d7202c217f0e410dabc74d4 /sci-libs/mkl | |
| parent | Delete older ebuild. (diff) | |
| download | gentoo-2-654150ba3a8cc964ac9ac98bde086e712119752a.tar.gz gentoo-2-654150ba3a8cc964ac9ac98bde086e712119752a.tar.bz2 gentoo-2-654150ba3a8cc964ac9ac98bde086e712119752a.zip | |
Fix for fortran detection, thanks Arfrever pointing on it
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/mkl')
| -rw-r--r-- | sci-libs/mkl/mkl-10.0.2.018-r2.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/mkl/mkl-10.0.5.025.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/mkl/mkl-9.1.023.ebuild | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild b/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild index 19026f7a60c7..bd12e295e8d5 100644 --- a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild +++ b/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.6 2010/12/17 13:41:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.7 2010/12/19 18:23:16 jlec Exp $ inherit eutils toolchain-funcs check-reqs @@ -61,11 +61,11 @@ pkg_setup() { # Check and setup fortran if use fortran95; then # blas95 and lapack95 don't compile with gfortran < 4.2 - [[ $(tc-getFC) =~ g.* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && + [[ $(tc-getFC) =~ g ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && die "blas95 and lapack95 don't compile with gfortran < 4.2" fi MKL_FC="gnu" - [[ $(tc-getFC) =~ if.* ]] && MKL_FC="intel" + [[ $(tc-getFC) =~ if ]] && MKL_FC="intel" # build profiles according to what compiler is installed MKL_CC="gnu" diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild index 7f294ffab06d..5a414f5fc0e7 100644 --- a/sci-libs/mkl/mkl-10.0.5.025.ebuild +++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.5.025.ebuild,v 1.8 2010/12/17 13:41:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.5.025.ebuild,v 1.9 2010/12/19 18:23:16 jlec Exp $ inherit eutils toolchain-funcs check-reqs @@ -61,11 +61,11 @@ pkg_setup() { # Check and setup fortran if use fortran95; then # blas95 and lapack95 don't compile with gfortran < 4.2 - [[ $(tc-getFC) =~ g.* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && + [[ $(tc-getFC) =~ g ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && die "blas95 and lapack95 don't compile with gfortran < 4.2" fi MKL_FC="gnu" - [[ $(tc-getFC) =~ if.* ]] && MKL_FC="intel" + [[ $(tc-getFC) =~ if ]] && MKL_FC="intel" # build profiles according to what compiler is installed MKL_CC="gnu" diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild index 6587195ea281..606909132a2b 100644 --- a/sci-libs/mkl/mkl-9.1.023.ebuild +++ b/sci-libs/mkl/mkl-9.1.023.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.12 2010/12/17 13:41:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.13 2010/12/19 18:23:16 jlec Exp $ inherit eutils versionator toolchain-funcs @@ -137,7 +137,7 @@ src_unpack() { fi # fix a bad makefile in the test - if [[ $(tc-getFC) =~ gfortran ]] || [[ $(tc-getFC) =~ if.* ]]; then + if [[ $(tc-getFC) =~ gfortran ]] || [[ $(tc-getFC) =~ if ]]; then sed -i \ -e "s/g77/$(tc-getFC)/" \ -e 's/-DGNU_USE//' \ @@ -181,7 +181,7 @@ src_compile() { src_test() { local usegnu - [[ $(tc-getFC) = g* ]] && usegnu=gnu + [[ $(tc-getFC) =~ g ]] && usegnu=gnu # restrict tests for blas and cblas for now. # for t in blas cblas fft*; do for t in blas lapack; do |