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 1Qbszx-00081m-58 for garchives@archives.gentoo.org; Wed, 29 Jun 2011 11:32:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AF3B1C01D; Wed, 29 Jun 2011 11:31:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16A5F1C01D for ; Wed, 29 Jun 2011 11:31:52 +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 58B851B4045 for ; Wed, 29 Jun 2011 11:31:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8515A8003C for ; Wed, 29 Jun 2011 11:31:51 +0000 (UTC) From: "Honza Macháček" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Honza Macháček" Message-ID: <60e43b80b7752dd0afb8ae3f3eb431ecd46118de.honza_machacek@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/abinit/ChangeLog sci-physics/abinit/abinit-6.6.3.ebuild X-VCS-Directories: sci-physics/abinit/ X-VCS-Committer: honza_machacek X-VCS-Committer-Name: Honza Macháček X-VCS-Revision: 60e43b80b7752dd0afb8ae3f3eb431ecd46118de Date: Wed, 29 Jun 2011 11:31:51 +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: 6a879eb7f13f346bb6181a74c26f637f commit: 60e43b80b7752dd0afb8ae3f3eb431ecd46118de Author: Honza Mach=C3=A1=C4=8Dek centrum cz> AuthorDate: Wed Jun 29 11:31:08 2011 +0000 Commit: Honza Mach=C3=A1=C4=8Dek centrum cz> CommitDate: Wed Jun 29 11:31:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D60e43b80 Restored the support for threaded fftw. Works for me. NEVER DISABLE FEATU= RES FOR OTHERS. --- sci-physics/abinit/ChangeLog | 4 ++++ sci-physics/abinit/abinit-6.6.3.ebuild | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index 3b8132d..237af8e 100644 --- a/sci-physics/abinit/ChangeLog +++ b/sci-physics/abinit/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 29 Jun 2011; Honza Mach=C3=A1=C4=8Dek abinit= -6.6.3.ebuild: + Restored the support for threaded fftw. Works for me. NEVER DISABLE FE= ATURES + FOR OTHERS. + 24 Jun 2011; Justin Lecher -abinit-6.6.2.ebuild, abinit-6.6.3.ebuild: Dropped ~ppc as many deps aren't keyworded diff --git a/sci-physics/abinit/abinit-6.6.3.ebuild b/sci-physics/abinit/= abinit-6.6.3.ebuild index eff92bd..3799d05 100644 --- a/sci-physics/abinit/abinit-6.6.3.ebuild +++ b/sci-physics/abinit/abinit-6.6.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D3 +EAPI=3D"3" =20 inherit autotools eutils fortran-2 multilib toolchain-funcs =20 @@ -15,8 +15,7 @@ SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"cuda -debug +fftw +fox gsl +hdf5 mpi +netcdf python -test +threa= ds -vdwxc" =20 -RDEPEND=3D" - >=3Dsci-libs/bigdft-1.2.0.2 +RDEPEND=3D">=3Dsci-libs/bigdft-1.2.0.2 sci-libs/etsf_io =3Dsci-libs/libxc-1.0[fortran] sci-physics/atompaw[libxc] @@ -72,8 +71,20 @@ src_configure() { local netcdff_libs=3D"-lnetcdff" use hdf5 && netcdff_libs=3D"${netcdff_libs} -lhdf5_fortran" local fft_flavor=3D"fftw3" - #fft_flavor=3D"fftw3-threads" causes a ./configure error - local fft_libs=3D"-L/usr/$(get_libdir) $(pkg-config --libs fftw3)" + local fft_libs=3D"-L/usr/lib" + # Since now, fftw threads support is protected by black magick. + # Anybody removes it again, dies. + # If it does not work FOR YOU, disable the "threads" USE flag + # for the package at YOUR box. If YOU want it disabled selectively + # for fftw use in abinit, you may consider adding a special USE flag + # for that. NEVER REMOVE AN OPTION FOR OTHERS, at least if there is + # anybody it works for. + if use threads; then + fft_libs=3D"${fft_libs} $(pkg-config --libs fftw3_threads)" + fft_flavor=3D"fftw3-threads" + else + fft_libs=3D"${fft_libs} $(pkg-config --libs fftw3)" + fi if use mpi; then MY_FC=3D"mpif90" MY_CC=3D"mpicc"