[gentoo-commits] proj/sci:master commit in: sci-physics/abinit/

["Dongxu Li" <dongxuli2011@gmail.com>]

commit:     1eac67505fc634ef3c4cbebfa3a7cf3f42e78c94
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Wed May 11 17:05:17 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Wed May 11 17:05:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1eac6750

sci-physics/abinit: fixed configure error for fftw3

---
 sci-physics/abinit/ChangeLog           |    3 +++
 sci-physics/abinit/abinit-6.6.2.ebuild |   11 ++---------
 sci-physics/abinit/abinit-6.6.3.ebuild |    9 ++-------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index 2847377..c3d7700 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -4,6 +4,9 @@
 
 *abinit-6.6.3 (10 May 2011)
 
+  11 May 2011; Dongxu Li <dongxuli2011@gmail.com> abinit-6.6.3.ebuild abinit-6.6.2.ebuild:
+  --with-fft-flavor=fftw3-threads still not accepted by configure, removed for the time being. arch="ppc" still causes DEPEND.bad
+
   10 May 2011; Honza Macháček <Hloupy.Honza@centrum.cz> +abinit-6.6.3.ebuild:
   Another quick version bump. Minor cleanup, smp removed until usable. Bizzare
   6.6.2 ebuild mostly ignored, but not deleted until discussed. In the list?

diff --git a/sci-physics/abinit/abinit-6.6.2.ebuild b/sci-physics/abinit/abinit-6.6.2.ebuild
index 12fab38..a879cd1 100644
--- a/sci-physics/abinit/abinit-6.6.2.ebuild
+++ b/sci-physics/abinit/abinit-6.6.2.ebuild
@@ -89,15 +89,8 @@ src_configure() {
 	local netcdff_libs="-lnetcdff"
 	use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran"
 	local fft_flavor="fftw3"
-	local fft_libs="-lfftw3"
-		fft_libs="${fft_libs} $(pkg-config --libs fftw3)"
-	#fft_flavor="fftw3-threads" doesn't build for me
-	#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
+	# fft_flavor="fftw3-threads" causes error in ./confgure
+	local fft_libs="/usr/$(get_libdir) $(pkg-config --libs fftw3)"
 	if use mpi; then
 		MY_FC="mpif90"
 		MY_CC="mpicc"

diff --git a/sci-physics/abinit/abinit-6.6.3.ebuild b/sci-physics/abinit/abinit-6.6.3.ebuild
index 4321fc1..fb8c996 100644
--- a/sci-physics/abinit/abinit-6.6.3.ebuild
+++ b/sci-physics/abinit/abinit-6.6.3.ebuild
@@ -69,13 +69,8 @@ src_configure() {
 	local netcdff_libs="-lnetcdff"
 	use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran"
 	local fft_flavor="fftw3"
-	local fft_libs="-L/usr/lib"
-	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
+	#fft_flavor="fftw3-threads" causes a ./configure error
+	local fft_libs="-L/usr/$(get_libdir) $(pkg-config --libs fftw3)"
 	if use mpi; then
 		MY_FC="mpif90"
 		MY_CC="mpicc"