diff options
| author |   Honza Macháček <Hloupy.Honza@centrum.cz> | 2011-06-29 13:31:08 +0200 |
|---|---|---|
| committer | Honza Macháček <Hloupy.Honza@centrum.cz> | 2011-06-29 13:31:08 +0200 |
| commit | 60e43b80b7752dd0afb8ae3f3eb431ecd46118de (patch) | |
| tree | 9fc02b9757b091928a9e9c66c7e461c0d5451142 /sci-physics/abinit | |
| parent | [sci-mathematics/scilab] fix patch name wrt bug 237572#c218 (diff) | |
| download | sci-60e43b80b7752dd0afb8ae3f3eb431ecd46118de.tar.gz sci-60e43b80b7752dd0afb8ae3f3eb431ecd46118de.tar.bz2 sci-60e43b80b7752dd0afb8ae3f3eb431ecd46118de.zip | |
Restored the support for threaded fftw. Works for me. NEVER DISABLE FEATURES FOR OTHERS.
Diffstat (limited to 'sci-physics/abinit')
| -rw-r--r-- | sci-physics/abinit/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-physics/abinit/Manifest | 14 | ||||
| -rw-r--r-- | sci-physics/abinit/abinit-6.6.3.ebuild | 21 |
3 files changed, 22 insertions, 17 deletions
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index 3b8132d6a..237af8e05 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: $ + 29 Jun 2011; Honza Macháček <Hloupy.Honza@centrum.cz> abinit-6.6.3.ebuild: + Restored the support for threaded fftw. Works for me. NEVER DISABLE FEATURES + FOR OTHERS. + 24 Jun 2011; Justin Lecher <jlec@gentoo.org> -abinit-6.6.2.ebuild, abinit-6.6.3.ebuild: Dropped ~ppc as many deps aren't keyworded diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest index 59552eef7..291920bf4 100644 --- a/sci-physics/abinit/Manifest +++ b/sci-physics/abinit/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 6.0.3-fftw.patch 571 RMD160 b15b2905fd46a1c0f6fcc99c317b1b52a327ef12 SHA1 b518c2db591d93a425598e780d1edd971fe38e0d SHA256 ad8e1810dcdd19a23baf7d951ce0c7af1b47e19e934c5cc6cb598431cfd2e21c AUX 6.2.2-change-default-directories.patch 1006 RMD160 ba252ecc7f5592f4df762716582c6e331a5e994f SHA1 4d79a7a261211c44692c09e63197261bfdb2c06e SHA256 8865966dd0d94b00443faae62b58e9938a5ba5d15bc32b59f79f815922f91c44 AUX 6.6.1-openmp.patch 19735 RMD160 6e6e42a5f030bdfb859583dd5e72ea434e980bcf SHA1 51c032ca7f52fe4e1c4afe86f2cb019166d4afbb SHA256 9568ace3732159ae395a3eef069338ded1d734becde1b8b382a58adf2f254933 DIST abinit-6.6.3.tar.gz 41161321 RMD160 f9169812cfb2dc30f752bf0ab0ffc41250ea0bbb SHA1 02c9fd6abe1b73164b804b6e0b1f829ec9fd286e SHA256 fad84d3e774e3b4ba16f2a2924e60b8ba42ab21fefd89d8ce4848f9a9e03f774 -EBUILD abinit-6.6.3.ebuild 5781 RMD160 95677e1c772b6aae9d87cf6a381db7c198f80744 SHA1 405e2d05f4f8ee77166cf1f226e3b49f1e0fd9ec SHA256 97211853e1c6596c4e2831eb5b38d61b0630554e6281c3fed6691ed31c66b797 -MISC ChangeLog 2741 RMD160 9de87c56b5154cf0d833ebdc43ea6fc88685b910 SHA1 b4d0d5fffcdd95d9a68a84200bf3ff8bc016c4be SHA256 821a82570007528ef368594f6b374c666bc58418cd7e249285948f80be94efa4 +EBUILD abinit-6.6.3.ebuild 6256 RMD160 88bf466811c42d04a57c1ddc6d3949d3ca6cdabf SHA1 3bdf27623990cb4e2131d333c6e5f690742e034a SHA256 fef385cfc374e619c12918ddcfe3c4c6e9e72eb297c1663e948eedfc2a6e675c +MISC ChangeLog 2914 RMD160 35ec89514eb6b3ed9bc8b6140330d5f825bacacd SHA1 a61a1e71602c5a765a79d9ccb4e1c1356d5c7c9a SHA256 5de5705c57a3ee875a7f27d186ee21152d65d333a5a22842987b6065a0d34fcf MISC metadata.xml 1225 RMD160 bebdbae077b05fe05bac5665b5b4d1f654620366 SHA1 464ff6d71e8b44df92c421a984c1f6a9cae38299 SHA256 71e7a9928f03914c9c5e6c45e6a6185a50f5c3dda7fbf791d3ca238dbee6727e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk4Ew2UACgkQgAnW8HDreRZ63QCgtkSitgNVi6hn0nvD6tUeRqVl -9IsAn37ME/PMSQEaQTp/3PKhFXTvE7b8 -=LO1G ------END PGP SIGNATURE----- diff --git a/sci-physics/abinit/abinit-6.6.3.ebuild b/sci-physics/abinit/abinit-6.6.3.ebuild index eff92bd7f..3799d0578 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: $ -EAPI=3 +EAPI="3" inherit autotools eutils fortran-2 multilib toolchain-funcs @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="cuda -debug +fftw +fox gsl +hdf5 mpi +netcdf python -test +threads -vdwxc" -RDEPEND=" - >=sci-libs/bigdft-1.2.0.2 +RDEPEND=">=sci-libs/bigdft-1.2.0.2 sci-libs/etsf_io =sci-libs/libxc-1.0[fortran] sci-physics/atompaw[libxc] @@ -72,8 +71,20 @@ src_configure() { local netcdff_libs="-lnetcdff" use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran" local fft_flavor="fftw3" - #fft_flavor="fftw3-threads" causes a ./configure error - local fft_libs="-L/usr/$(get_libdir) $(pkg-config --libs fftw3)" + local fft_libs="-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="${fft_libs} $(pkg-config --libs fftw3_threads)" + fft_flavor="fftw3-threads" + else + fft_libs="${fft_libs} $(pkg-config --libs fftw3)" + fi if use mpi; then MY_FC="mpif90" MY_CC="mpicc" |