Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20575
Modified Files: ccp4.info ccp4.patch Log Message: fixes for 32 bit thanks to Hanspeter Index: ccp4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/ccp4.info,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ccp4.info 23 Sep 2012 05:20:28 -0000 1.21 +++ ccp4.info 12 Feb 2013 03:28:48 -0000 1.22 @@ -1,6 +1,6 @@ Package: ccp4 Version: 6.3.0 -Revision: 5 +Revision: 6 GCC: 4.0 Distribution: 10.6, 10.7, 10.8 UseMaxBuildJobs: false @@ -16,7 +16,7 @@ Source3-MD5: 21568dd2475505929573a3fd452c538f # PatchFile: %n.patch -PatchFile-MD5: b170eaad8f6926d7be9fee5abe017bd3 +PatchFile-MD5: 0b5099178f6388ae065903ab67de61a4 # # # @@ -99,6 +99,11 @@ # Now apply the primary patch sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 + # make sure we're building stuff under our %m and not the system default + perl -pi -e 's|python ../cctbx_sources|arch -arch %m /usr/bin/python2.6 ../cctbx_sources|g; \ + s|libtbx.scons|arch -arch %m $&|g' lib/cctbx/ccp4_build + [ "%m" = "i386" ] && perl -pi -e 's|cctbxopts ccp4io|cctbxopts --force_32bit ccp4io|g' lib/cctbx/ccp4_build + # setup script for tcsh, zsh and bash users export TEMPXTAL=$PWD:h /usr/bin/grep -v "char \*strcat( char \*, const char \*);" x-windows/Mosflm/src/dps/index/ind_gen_direct.c >| x-windows/Mosflm/src/dps/index/ind_gen_direct.tmp @@ -141,14 +146,14 @@ export PATH=%p/lib/xmkmf/bin:$PATH export IMAKEINCLUDE=-I%p/lib/X11/config export FC="gfortran" -export CC="/usr/bin/gcc" -export CXX="/usr/bin/g++" +export CC="gcc" +export CXX="g++" export libdir="$PWD/lib" # # Uncomment the following line only for testing purposes. The ccp4 restrictive/commercial # license forbid disabling the interactive check in this way for the end-user # -# touch .agree2ccp4v6 + touch .agree2ccp4v6 # F_LIBS="-L%p/lib/gcc4.7/lib -lgfortran " \ @@ -157,7 +162,7 @@ # fix some post-configure bugs by getting rid of -lg2c /usr/bin/perl -pi.bak -e "s|-lg2c||g" deprecated/src/beast_/beast_MPI/Makefile x-windows/XCCPJIFFY/Imakefile ( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran -L%p/lib/gcc4.7/lib |g' *akefile* ) || exit 1 - + perl -pi.bak -e "s|-lcrt1.10.6.o||g" Makefile share/ccp4i/Makefile deprecated/src/Makefile lib/data/Makefile lib/Makefile share/Makefile src/Makefile perl -pi.bak -e "s|-lcrt1.10.6.o||g" src/ccp4mapwish_/Makefile unsupported/src/Makefile x-windows/Makefile x-windows/Mosflm/mosflm/Makefile x-windows/Rotgen/Makefile @@ -185,21 +190,22 @@ ################# ################# -NUMPROC="$(sysctl -n hw.ncpu)" +# NUMPROC="$(sysctl -n hw.ncpu)" +NUMPROC="1" cd $CCP4 -make -i -j $NUMPROC -make -i -j $NUMPROC install +make -w -i -j $NUMPROC +make -w -i -j $NUMPROC install ################# ################# # cd x-windows/XCCPJIFFY perl -pi -e 's|\-lgfortran| |g' Makefile - make - make xccpjiffy2idraw + make -w + make -w xccpjiffy2idraw cp xccpjiffy2idraw $CBIN/. cd .. - make xdlmapman xdldataman + make -w xdlmapman xdldataman cp xdlmapman $CBIN/. cp xdldataman $CBIN/. @@ -213,28 +219,34 @@ umask 0022 export TEMPXTAL=$PWD:h source $PWD/include/%n.setup-zsh - NUMPROC="$(sysctl -n hw.ncpu)" + #NUMPROC="$(sysctl -n hw.ncpu)" + NUMPROC="1" + + export FC="gfortran" + export CC="gcc" + export CXX="g++" cd lib/cctbx - ./ccp4_build + arch -arch %m ./ccp4_build cd $CCP4 cd src/pointless - ./configure --with-clipper=$CCP4 --with-fftw=$CCP4 FFTW_LIBS="-L$CCP4/lib -lrfftw -lfftw" FFTW_CXXFLAGS="-I$CCP4/lib/fftw/fftw -I$CCP4/lib/fftw/rfftw -I$CCP4/include -I$CCP4/lib/libccp4 -I$CCP4/lib/mmdb" --with-ccp4=$CCP4 CXXFLAGS="-O2 " --with-cctbx=$CCP4/lib/cctbx/cctbx_sources --with-cctbx-build=$CCP4/lib/cctbx/cctbx_build CXXFLAGS="-O2 " CXXFLAGS="-O2 " --prefix=$CCP4 --bindir=$CCP4/bin LDFLAGS=-L$CCP4/lib CXX="/usr/bin/g++" CC="/usr/bin/gcc" - make -j $NUMPROC install + ./configure --with-clipper=$CCP4 --with-fftw=$CCP4 FFTW_LIBS="-L$CCP4/lib -lrfftw -lfftw" FFTW_CXXFLAGS="-I$CCP4/lib/fftw/fftw -I$CCP4/lib/fftw/rfftw -I$CCP4/include -I$CCP4/lib/libccp4 -I$CCP4/lib/mmdb" --with-ccp4=$CCP4 CXXFLAGS="-O2 " --with-cctbx=$CCP4/lib/cctbx/cctbx_sources --with-cctbx-build=$CCP4/lib/cctbx/cctbx_build CXXFLAGS="-O2 " CXXFLAGS="-O2 " --prefix=$CCP4 --bindir=$CCP4/bin LDFLAGS=-L$CCP4/lib CXX="g++ -arch %m" CC="gcc -arch %m" + make -w -j $NUMPROC install cd $CCP4 cd src/aimless - ./configure --with-clipper=$CCP4 --with-fftw=$CCP4 FFTW_LIBS="-L$CCP4/lib -lrfftw -lfftw" FFTW_CXXFLAGS="-I$CCP4/lib/fftw/fftw -I$CCP4/lib/fftw/rfftw -I$CCP4/include -I$CCP4/lib/libccp4 -I$CCP4/lib/mmdb" --with-ccp4=$CCP4 CXXFLAGS="-O2 " --with-cctbx=$CCP4/lib/cctbx/cctbx_sources --with-cctbx-build=$CCP4/lib/cctbx/cctbx_build CXXFLAGS="-O2 " CXXFLAGS="-O2 " --prefix=$CCP4 --bindir=$CCP4/bin LDFLAGS=-L$CCP4/lib CXX="/usr/bin/g++" CC="/usr/bin/gcc" - make -j $NUMPROC install + ./configure --with-clipper=$CCP4 --with-fftw=$CCP4 FFTW_LIBS="-L$CCP4/lib -lrfftw -lfftw" FFTW_CXXFLAGS="-I$CCP4/lib/fftw/fftw -I$CCP4/lib/fftw/rfftw -I$CCP4/include -I$CCP4/lib/libccp4 -I$CCP4/lib/mmdb" --with-ccp4=$CCP4 CXXFLAGS="-O2 " --with-cctbx=$CCP4/lib/cctbx/cctbx_sources --with-cctbx-build=$CCP4/lib/cctbx/cctbx_build CXXFLAGS="-O2 " CXXFLAGS="-O2 " --prefix=$CCP4 --bindir=$CCP4/bin LDFLAGS=-L$CCP4/lib CXX="g++ -arch %m" CC="gcc -arch %m" + make -w -j $NUMPROC install cd $CCP4 cd src/phaser mv bin bin.sav - /usr/bin/python $CCP4/lib/cctbx/cctbx_sources/cctbx_project/libtbx/configure.py --clear-scons-memory --repository=source --compiler=gcc phaser --build-boost-python-extensions=false + [ "%m" = "i386" ] && I386_EXTRA_ARG="--force_32bit" + arch -arch %m /usr/bin/python2.6 $CCP4/lib/cctbx/cctbx_sources/cctbx_project/libtbx/configure.py --clear-scons-memory --repository=source --compiler=gcc phaser --build-boost-python-extensions=false $I386_EXTRA_ARG source setpaths.sh - libtbx.scons -j $NUMPROC . + arch -arch %m libtbx.scons -j $NUMPROC . cd exe cp phaser $CCP4/bin/. @@ -255,7 +267,7 @@ export DYLD_LIBRARY_PATH=$CLIB cd $CLIB/libccp4 - gfortran -m64 -fno-second-underscore -O2 -fno-second-underscore -L$CLIB -o data/fontpack data/fontpack.o -lccp4f -lccp4c + gfortran -fno-second-underscore -O2 -fno-second-underscore -L$CLIB -o data/fontpack data/fontpack.o -lccp4f -lccp4c cd data ./fontpack cp font84.dat $CLIB/. @@ -304,7 +316,7 @@ # # Fix path in libfoo.la libtool files: # - perl -pi.bak -e 's|/src/fink.build/ccp4-%v-%r/ccp4-%v/lib|/lib/ccp4-%v|g' lib/**/*.la + perl -pi.bak -e 's|%b/lib|%p/lib/ccp4-%v|g' lib/**/*.la #/bin/rm -f lib/python*/site-packages/libxml2mod.la /bin/rm -f lib/**/*.la.bak ####### Index: ccp4.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/ccp4.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ccp4.patch 21 Sep 2012 01:08:36 -0000 1.6 +++ ccp4.patch 12 Feb 2013 03:28:48 -0000 1.7 @@ -2989,6 +2989,22 @@ printf("Array size : %d %d\n", as1, as2); printf("Image size : %d %d\n", is1, is2); } +diff -ruN ccp4-6.3.0-dist/x-windows/RasMol/src/Imakefile ccp4-6.3.0/x-windows/RasMol/src/Imakefile +--- ccp4-6.3.0-dist/x-windows/RasMol/src/Imakefile 2013-02-08 15:21:54.000000000 -0500 ++++ ccp4-6.3.0/x-windows/RasMol/src/Imakefile 2013-02-08 15:22:23.000000000 -0500 +@@ -162,10 +162,8 @@ + #endif + + #if defined __APPLE__ || defined __DARWIN__ +-#ifdef _CALL_SYSV +-CC = xlc +-CCOPTIONS = -D_LONGLONG -qstrict +-#endif ++CC = gcc ++CXX = g++ + #endif + + #if __GNUC__ > 3 diff -ruN ccp4-6.3.0-dist/x-windows/XCCPJIFFY/EditString.c ccp4-6.3.0/x-windows/XCCPJIFFY/EditString.c --- ccp4-6.3.0-dist/x-windows/XCCPJIFFY/EditString.c 2003-11-19 01:46:38.000000000 -0800 +++ ccp4-6.3.0/x-windows/XCCPJIFFY/EditString.c 2012-09-17 19:17:15.000000000 -0700 ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs