Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31502
Modified Files:
ccp4.info
Log Message:
ccp4 to use its own fftw
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ccp4.info 9 Mar 2008 22:16:58 -0000 1.29
+++ ccp4.info 12 Mar 2008 20:13:53 -0000 1.30
@@ -1,6 +1,6 @@
Package: ccp4
Version: 6.0.2
-Revision: 8
+Revision: 9
GCC: 4
Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz
Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16
@@ -84,14 +84,13 @@
tcltk,
blt,
gcc43-shlibs,
- fftw-shlibs (>=2.1.5-1014), %N-shlibs (= %v-%r)
+ %N-shlibs (= %v-%r)
<<
BuildDepends: <<
gcc43,
f2c,
fort77,
- tcltk-dev,
- fftw (>=2.1.5-1014)
+ tcltk-dev
<<
Replaces: <<
mosflm (<= 6.2.3-2),
@@ -205,9 +204,11 @@
# Disable building of pdb_extract and phaser in 10.5. CCP4 6.1 will fix
this.
if [[ $(sw_vers -productVersion) < 10.5 ]]; then
- FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --with-shared-libs --with-fftw=%p --with-x Darwin
+ FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --with-shared-libs --with-x Darwin
+ # --with-fftw=%p
else
- FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --disable-pdb_extract --disable-cctbx --disable-phaser
--with-shared-libs --with-fftw=%p --with-x Darwin
+ FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --disable-pdb_extract --disable-cctbx --disable-phaser
--with-shared-libs --with-x Darwin
+ # --with-fftw=%p
fi
# fix some post-configure bugs by getting rid of -lg2c
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
