Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9143
Modified Files: ccp4-gfortran.info Log Message: tweaked for intel compat Index: ccp4-gfortran.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4-gfortran.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccp4-gfortran.info 3 Mar 2006 06:56:35 -0000 1.1 +++ ccp4-gfortran.info 12 Apr 2006 01:36:27 -0000 1.2 @@ -1,6 +1,6 @@ Package: ccp4-gfortran Version: 6.0 -Revision: 1002 +Revision: 1004 GCC: 4 Source: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/ccp4-%v.0-core-src.tar.gz Source2: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/phaser-1.3.2-cctbx-src.tar.gz @@ -10,9 +10,9 @@ Source3: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz Source3-MD5: 21568dd2475505929573a3fd452c538f Depends: x11, tcltk, blt -BuildDepends: gcc4 (>= 4.1.0-1), f2c, fort77, tcltk-dev +BuildDepends: gcc4 (>= 4.0.3-1), f2c, fort77, tcltk-dev Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<= 5.1999-3), ccp4-shlibs, ccp4, ccp4-dev, bundle-ccp4, clipper-bin -Conflicts: ccp4-shlibs, ccp4, ccp4-dev, bundle-ccp4, clipper-bin +Conflicts: ccp4-shlibs, ccp4, ccp4-dev, bundle-ccp4 NoSetCPPFLAGS: true NoSetLDFLAGS: true # @@ -55,11 +55,15 @@ export PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3" # gfortran is actually used by default, but to ensure the right thing happens, specify it. # Build static libs only for now. -FC="gfortran" ./configure --with-x Darwin +FC="gfortran" FOPTIM="-O0" CC="%p/lib/gcc4/bin/gcc" CXX="%p/lib/gcc4/bin/g++" ./configure --with-x Darwin # FC="gfortran" ./configure --with-x --with-shared-libs --with-fftw=%p Darwin # fix some post-configure bugs by getting rid of -lg2c perl -pi.bak -e 's|-lg2c||g' x-windows/**/*akefile* # +# change molrep optimization: +perl -pi.bak -e "s|molrep_FLAGS='-fno-second-underscore -O1'|molrep_FLAGS='-fno-second-underscore -O0'|g" src/Makefile + +perl -pi.bak -e 's|FC = g77 -fno-second-underscore||g' x-windows/XCCPJIFFY/Makefile make -i make -i install # @@ -77,7 +81,10 @@ echo "**********************************************************************" echo "" # -fort77 -fno-second-underscore -o xloggraph -L/usr/lib msg_box.o ZDr2d.o EditString.o hardcopy_ctrl.o xloggraph.o log_file.o tom_fortran_interface.o bits_and_pieces.o graphics.o -g -Os -I/usr/include/X11R6 -L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm -lgcc -lSystemStubs + perl -pi.bak -e 's|FC = g77 -fno-second-underscore||g' Makefile + make -i xloggraph 2>/dev/null + fort77 -o xloggraph msg_box.o ZDr2d.o EditString.o hardcopy_ctrl.o xloggraph.o log_file.o tom_fortran_interface.o bits_and_pieces.o graphics.o -g -Os -I/usr/include/X11R6 -L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm -lgfortran -L%p/lib/gcc4/lib + # sleep 10 # @@ -86,6 +93,7 @@ # # make realclean /bin/rm -f **/*.o +/bin/rm -f **/*.bak echo "Compile Phase Completed!" echo "There are $(command ls -1 $CBIN | wc -l) programs in $CBIN; there should be 200" << @@ -98,12 +106,11 @@ export DYLD_LIBRARY_PATH=$CLIB ORIGDIR=$(dirname $PWD) # Change environment scripts to match final installation -perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' include/ccp4.setup* # install prefix -# perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' lib/cctbx/cctbx_build/setpaths* +perl -pi -e 's|\$TEMPXTAL|%p/share/xtal|g' include/ccp4.setup* # install prefix # # cp ../XCCPJiffy-custom.gz XCCPJiffy.gz ; gunzip XCCPJiffy.gz; chmod a+x XCCPJiffy - perl -pi.bak -e 's|5.0.1|%v|g' XCCPJiffy + perl -pi -e 's|5.0.1|%v|g' XCCPJiffy mv -f XCCPJiffy lib/X11/app-defaults/XCCPJiffy # perl -pi.bak -e 's|/src/fink.build/ccp4-%v-%r|/share/xtal|g' bin/clipper-config @@ -188,7 +195,8 @@ DescDetail: << These are the ccp4 programs compiled with gfortran instead of g77. The (currently default) g77 version won't work on intel. The hope -is that this will. +is that this will. (With gfortran-4.0.3, everything compiles except +cpirate; install that from the clipper-bin package.) CCP4 macromolecular crystallography suite has approximately 200 programs and utilities. This version included Clipper ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits