Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6516
Modified Files: ccp4.info Log Message: ccp4 fixed for 10.5 but unchanged for 10.4, keep revision number as 7 Index: ccp4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ccp4.info 14 Oct 2007 00:01:09 -0000 1.25 +++ ccp4.info 28 Nov 2007 00:27:55 -0000 1.26 @@ -1,7 +1,6 @@ Package: ccp4 Version: 6.0.2 Revision: 7 -Distribution: 10.4 GCC: 4 Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16 @@ -183,16 +182,27 @@ export rpath=%p/lib/ccp4-%v export RPATH=%p/lib/ccp4-%v - # The cctbx sub-package requires us to use the system's own Python - export PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH - export PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current" - export PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3" +if [[ $(sw_vers -productVersion) < 10.5 ]]; then +# # The cctbx sub-package requires us to use the system's own Python + export PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH + export PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current" + export PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3" +fi # gfortran is actually used by default, but to ensure the right thing happens, specify it. + + # 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.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib" ./configure --with-shared-libs --with-fftw=%p --with-x Darwin +else + FC="%p/lib/gcc4.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib" ./configure --disable-pdb_extract --disable-cctbx --disable-phaser --with-shared-libs --with-fftw=%p --with-x Darwin +fi # fix some post-configure bugs by getting rid of -lg2c perl -pi.bak -e 's|-lg2c||g' x-windows/**/*akefile* + + if [[ $(uname -p) != powerpc ]];then perl -pi.bak -e 's|%p/lib/gcc4.2/bin/||g' lib/clipper/**/Makefile* @@ -204,7 +214,13 @@ fi ( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran -L%p/lib/gcc4.2/lib |g' *akefile* ) || exit 1 - +if [[ $(sw_vers -productVersion) < 10.5 ]]; then + : +else + perl -pi.bak -e 's|-lcrt1.10.5.o||g' **/*akefile + perl -pi.bak -e 's|-lcrt1.o||g' **/*akefile +fi + ################# make make install @@ -435,6 +451,14 @@ CCP4 files will be installed under /sw/share/xtal/ccp4-6.0.2 This revision includes all available CCP4 patches as of June 28, 2007. and new bash and zsh command completions specific to ccp4. + + On 10.5, phaser and cctbx fail to compile. Current workaround is to + install the fink cctbx package, and to obtain phaser from here + http://www-structmed.cimr.cam.ac.uk/phaser/download.html + or obtain phenix, which includes phenix.phaser, from here + http://www.phenix-online.org/ + Both are restricted downloads that require registration. + This will be corrected upstream for the CCP4 6.1 release. << DocFiles: << README CHANGES COPYING PROBLEMS INSTALL INSTALL.html INSTALL.ps ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs