From 1eac67505fc634ef3c4cbebfa3a7cf3f42e78c94 Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Wed, 11 May 2011 13:05:17 -0400 Subject: sci-physics/abinit: fixed configure error for fftw3 --- sci-physics/abinit/ChangeLog | 3 +++ sci-physics/abinit/Manifest | 6 +++--- sci-physics/abinit/abinit-6.6.2.ebuild | 11 ++--------- sci-physics/abinit/abinit-6.6.3.ebuild | 9 ++------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index 2847377d8..c3d770043 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 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 +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/Manifest b/sci-physics/abinit/Manifest index d372d2505..4c5522312 100644 --- a/sci-physics/abinit/Manifest +++ b/sci-physics/abinit/Manifest @@ -3,7 +3,7 @@ AUX 6.2.2-change-default-directories.patch 1006 RMD160 ba252ecc7f5592f4df7627165 AUX 6.6.1-openmp.patch 19735 RMD160 6e6e42a5f030bdfb859583dd5e72ea434e980bcf SHA1 51c032ca7f52fe4e1c4afe86f2cb019166d4afbb SHA256 9568ace3732159ae395a3eef069338ded1d734becde1b8b382a58adf2f254933 DIST abinit-6.6.2.tar.gz 41103295 RMD160 d231811cb393c4cd1a51447f924715b8f617f56f SHA1 b3710bad16535a0eac6d7924b2a0d44b871de71d SHA256 c2d8e132591bbf96fa2f868fae4e39df92050b63090023ef561a163ca568a05b DIST abinit-6.6.3.tar.gz 41161321 RMD160 f9169812cfb2dc30f752bf0ab0ffc41250ea0bbb SHA1 02c9fd6abe1b73164b804b6e0b1f829ec9fd286e SHA256 fad84d3e774e3b4ba16f2a2924e60b8ba42ab21fefd89d8ce4848f9a9e03f774 -EBUILD abinit-6.6.2.ebuild 6687 RMD160 c97b33c623d0854b0131277e32b8ee3b635d4e07 SHA1 ab45057fb6a95f7cf45dbe9f2c1fc03c5480e4ad SHA256 c393f67f67848286201298860df317625313501bf735fdfda3cb4e8793893125 -EBUILD abinit-6.6.3.ebuild 5822 RMD160 14dfad3b97fdace54ebcb9cce238a3d7ada78762 SHA1 a4eb78a2d98cb406979928e8112795249cd1dc3f SHA256 c3913b9105c8515eb6960186f61c662fe918a360c2242c317490cea1fb8ce047 -MISC ChangeLog 2256 RMD160 a0f56fd7a15716cfb6aaf9d5e6c9857e0a93e122 SHA1 65d30a03cbdde1d6c3dc674762efd4cc9964de39 SHA256 abdb415b3097673d67781ddfa7354c6d14a196f2557c8352e172199c6c12fa31 +EBUILD abinit-6.6.2.ebuild 6498 RMD160 a9d7d765250aa1d40663c280719b5b9fae9ad509 SHA1 1f3f3a11b41d9ebe981cda82dfd14eec19a927d0 SHA256 c492abaccfa2a269278832b17d5034e9d3cabcf0fe276d89e48be858832b01c7 +EBUILD abinit-6.6.3.ebuild 5742 RMD160 2ac569eac21714e1bfb0c244e8567409a184dc01 SHA1 836e7a5e71c45360689516538ebd17dac62f5eae SHA256 1e6ed77ec63e8764c2f32ce0fcc57836b806a0362b5e40e5cd7aaeedf9765580 +MISC ChangeLog 2478 RMD160 eb660f69e179ff048956e1d07840c9dd18cc81d5 SHA1 de803e05449a9b17c30d141c53e8f717e0239365 SHA256 b2d0fdcd5fc76a0a8498f69254f61d6e3aebf79c37753c2814cbdb27fbae35c4 MISC metadata.xml 1225 RMD160 bebdbae077b05fe05bac5665b5b4d1f654620366 SHA1 464ff6d71e8b44df92c421a984c1f6a9cae38299 SHA256 71e7a9928f03914c9c5e6c45e6a6185a50f5c3dda7fbf791d3ca238dbee6727e diff --git a/sci-physics/abinit/abinit-6.6.2.ebuild b/sci-physics/abinit/abinit-6.6.2.ebuild index 12fab3820..a879cd149 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 4321fc1c7..fb8c9967b 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" -- cgit v1.2.3-65-gdbad