From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qa9zJ-0003xZ-5t for garchives@archives.gentoo.org; Fri, 24 Jun 2011 17:16:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E79D1C200; Fri, 24 Jun 2011 17:09:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 55A531C1D6 for ; Fri, 24 Jun 2011 17:09:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57C872AC010 for ; Fri, 24 Jun 2011 17:09:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B4E838004B for ; Fri, 24 Jun 2011 17:09:10 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/fftw/ChangeLog sci-libs/fftw/fftw-3.3_alpha1.ebuild X-VCS-Directories: sci-libs/fftw/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b53ef5955af95fd7543f7b4ac691afff0b8b1504 Date: Fri, 24 Jun 2011 17:09:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a690dad94545a9d2b14118a648106a8b commit: b53ef5955af95fd7543f7b4ac691afff0b8b1504 Author: Justin Lecher gentoo org> AuthorDate: Fri Jun 24 12:19:37 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Jun 24 12:19:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db53ef595 Streamlined fortran-2 eclass usage (Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key 70EB7916) --- sci-libs/fftw/ChangeLog | 3 +++ sci-libs/fftw/fftw-3.3_alpha1.ebuild | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index d1d8a04..99038b1 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 24 Jun 2011; Justin Lecher fftw-3.3_alpha1.ebuild: + Streamlined fortran-2 eclass usage + 21 Jun 2011; Justin Lecher fftw-3.3_alpha1.ebuild: Added fortran-2.eclass support =20 diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.= 3_alpha1.ebuild index 700e8ab..3d9e309 100644 --- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild +++ b/sci-libs/fftw/fftw-3.3_alpha1.ebuild @@ -15,12 +15,15 @@ SLOT=3D"3.0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86= ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE=3D"altivec doc fortran mpi openmp sse sse2 static-libs threads" =20 -DEPEND=3D"mpi? ( virtual/mpi )" +DEPEND=3D" + fortran? ( virtual/fortran ) + mpi? ( virtual/mpi )" RDEPEND=3D"${DEPEND}" =20 S=3D"${WORKDIR}/${P//_}" =20 pkg_setup() { + use openmp && FORTRAN_NEED_OPENMP=3D"1" use fortran && fortran-2_pkg_setup FFTW_THREADS=3D"--disable-threads --disable-openmp" if use openmp; then @@ -28,12 +31,7 @@ pkg_setup() { elif use threads; then FFTW_THREADS=3D"--enable-threads --disable-openmp" fi - if use openmp && - [[ $(tc-getCC)$ =3D=3D *gcc* ]] && - [[ $(tc-getCC)$ !=3D *apple* ]] && - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! has_version sys-devel/gcc[openmp] ) - then + if use openmp && ! tc-has-openmp; then ewarn "You are using gcc and OpenMP is only available with gcc >=3D 4.= 2 " ewarn "If you want to build fftw with OpenMP, abort now," ewarn "and switch CC to an OpenMP capable compiler"