From c5cdb614348924e4d46ee07956712c1c8979c7b2 Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Sat, 9 Apr 2011 13:08:03 -0400 Subject: Fix FFTW3 lib path on amd64. Need more work to get C/Fortran bindings --- sci-physics/abinit/ChangeLog | 4 ++++ sci-physics/abinit/Manifest | 4 ++-- sci-physics/abinit/abinit-6.6.1.ebuild | 17 +++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) (limited to 'sci-physics') diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index 8ba0cc1b9..78e3079c8 100644 --- a/sci-physics/abinit/ChangeLog +++ b/sci-physics/abinit/ChangeLog @@ -4,6 +4,10 @@ *abinit-6.6.1 (07 Mar 2011) + 09 Apr 2011; Dongxu Li + abinit-6.6.1.ebuild: + Simple fix of a building issue due to FFTW. Disabled fftw-threads. + 07 Mar 2011; Honza Macháček +files/6.6.1-openmp.patch, +abinit-6.6.1.ebuild: A quick bump to sci-physics/abinit-6.6.1. Some cleanup, some mess. Switched diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest index 7aa5160dd..2dfef96c8 100644 --- a/sci-physics/abinit/Manifest +++ b/sci-physics/abinit/Manifest @@ -11,5 +11,5 @@ DIST abinit-6.4.3.tar.gz 42502489 RMD160 5d1b4d03079570f29bc1195c6ac12ace3d5e842 DIST abinit-6.6.1.tar.gz 41106793 RMD160 fb5dc06e06aa229e7e036f50376b4eca6400e79b SHA1 f81d2eec5aea403671ec071d0bc91a116a303492 SHA256 12a0d1b0c85dc0fdc47f8ac0213077de22f53a7bfb5b4b849cecd19a90ac4fca EBUILD abinit-6.4.2.ebuild 6671 RMD160 fa2fee9d5a35a130c03aa8f38a9993d20f7ef5df SHA1 d6107590dd8191c3bb6a27ea6ce8535afc6356c7 SHA256 2eb6d7fdff190a0fdf57c922ef0375444a82a21e8727246228e673228a215574 EBUILD abinit-6.4.3.ebuild 6936 RMD160 38bdb6145e4dea71a9b9f08628955cb2a47f562c SHA1 f063b38dbd871c36751f23301990e27c636d121e SHA256 44e53c19079ae9b74cb79df6889ea759a6e8e4f93c61f4a1f868e94dad3ee819 -EBUILD abinit-6.6.1.ebuild 6360 RMD160 39521e0aac623c1b33b1700eaf688fdfff8f5b99 SHA1 536ce8e6d610d2c58295901799b98f743c459cc8 SHA256 c3a068c1768affafe67d7829262db47542a0fed4e66a57c0fed1fa50444831fa -MISC ChangeLog 1674 RMD160 7ac39be7145f3f0240d6a4db8f726f4c70a6062f SHA1 a01e9bc6286944b7f186b47ba1342b36cc66ad47 SHA256 44245fa60511df814863ffd91df847b23da7271a8abcbc243d0fb44a2fecae5d +EBUILD abinit-6.6.1.ebuild 6580 RMD160 1e756d01fbc1756d7dda254a3ae4d7d1471419e7 SHA1 d157cc6d86afedca3ab5feefde995c36a28f7bf0 SHA256 dd6cca76f72d5388ec00e619ba1a611217505161f260d4914bf3063d1b1ed685 +MISC ChangeLog 1817 RMD160 0ddd6477da1d5842c931ceb5788e563e6cfd8651 SHA1 50e15f86e8ddafd6cd02df73ee8606dce26251dc SHA256 fd74bd7de9df0874a4ce3b06ef3a05a1fa64fe9a4d887b35ac7bfc98b2ca35af diff --git a/sci-physics/abinit/abinit-6.6.1.ebuild b/sci-physics/abinit/abinit-6.6.1.ebuild index 5fa9ce41c..ed5651feb 100644 --- a/sci-physics/abinit/abinit-6.6.1.ebuild +++ b/sci-physics/abinit/abinit-6.6.1.ebuild @@ -81,13 +81,15 @@ 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 + local fft_libs="-lfftw3" fft_libs="${fft_libs} $(pkg-config --libs fftw3)" - fi + #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 if use mpi; then MY_FC="mpif90" MY_CC="mpicc" @@ -102,6 +104,9 @@ src_configure() { MY_CC="${MY_CC} -fopenmp" MY_CXX="${MY_CXX} -fopenmp" fi + #enable bindings for ab6 header and libraries + # --enable-bindings + #--with-fc-version=f90 --enable-bindings \ MARKDOWN=Markdown.pl econf \ $(use_enable debug debug enhanced) \ $(use_enable mpi) \ -- cgit v1.2.3-65-gdbad