diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-08-28 13:49:20 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-08-28 13:49:20 +0000 |
| commit | 2c66e6743240bbc6ed1f70789774a2d2a83e27fe (patch) | |
| tree | fe8f99bae152cdc0fd2ca15024a35e93d47c12cc | |
| parent | Add development snapshot that's masked (diff) | |
| download | historical-2c66e6743240bbc6ed1f70789774a2d2a83e27fe.tar.gz historical-2c66e6743240bbc6ed1f70789774a2d2a83e27fe.tar.bz2 historical-2c66e6743240bbc6ed1f70789774a2d2a83e27fe.zip | |
Fixed openmp tests for gcc < 4.2
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-2.1.5-r5.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-3.1.2-r1.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/metadata.xml | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 72a20727eb63..d877170fe54b 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/fftw # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.70 2008/08/07 06:24:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.71 2008/08/28 13:49:20 bicatali Exp $ + + 28 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org> fftw-2.1.5-r5.ebuild, + fftw-3.1.2-r1.ebuild: + Fixed openmp tests for gcc < 4.2 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/sci-libs/fftw/fftw-2.1.5-r5.ebuild b/sci-libs/fftw/fftw-2.1.5-r5.ebuild index 5028311b7230..7a23a1c01c21 100644 --- a/sci-libs/fftw/fftw-2.1.5-r5.ebuild +++ b/sci-libs/fftw/fftw-2.1.5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.2 2008/07/10 14:36:38 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.3 2008/08/28 13:49:20 bicatali Exp $ inherit eutils flag-o-matic multilib autotools fortran toolchain-funcs @@ -28,8 +28,8 @@ pkg_setup() { fi if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && - [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! built_with_use sys-devel/gcc openmp + ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || + ! built_with_use sys-devel/gcc openmp ) then ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " ewarn "If you want to build fftw with OpenMP, abort now," diff --git a/sci-libs/fftw/fftw-3.1.2-r1.ebuild b/sci-libs/fftw/fftw-3.1.2-r1.ebuild index fe31b9b175fa..e4c4bcad25e6 100644 --- a/sci-libs/fftw/fftw-3.1.2-r1.ebuild +++ b/sci-libs/fftw/fftw-3.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2-r1.ebuild,v 1.3 2008/07/10 14:36:38 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2-r1.ebuild,v 1.4 2008/08/28 13:49:20 bicatali Exp $ inherit flag-o-matic eutils toolchain-funcs autotools fortran @@ -16,8 +16,8 @@ IUSE="altivec doc fortran openmp sse sse2 threads" pkg_setup() { if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && - [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! built_with_use sys-devel/gcc openmp + ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || + ! built_with_use sys-devel/gcc openmp ) then ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " ewarn "If you want to build fftw with OpenMP, abort now," diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml index de500ad77d85..6ea235f1913d 100644 --- a/sci-libs/fftw/metadata.xml +++ b/sci-libs/fftw/metadata.xml @@ -13,8 +13,8 @@ </longdescription> <use> <flag name='float'>Link default library to single precision instead of - double (symlinks only)</flag> - <flag name='openmp'>Build support for the OpenMP (support parallel - computing)</flag> + double (symlinks only and fftw-2.1)</flag> + <flag name='openmp'>Build support for the OpenMP parallel + computing library. Needs OpenMP capable compiler (e.g. gcc >= 4.2)</flag> </use> </pkgmetadata> |