Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28606
Modified Files:
ccp4.info
Log Message:
update to build on 10.9
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ccp4.info 23 Sep 2012 05:19:11 -0000 1.11
+++ ccp4.info 2 Aug 2013 17:53:46 -0000 1.12
@@ -1,8 +1,8 @@
Package: ccp4
Version: 6.3.0
-Revision: 5
+Revision: 6
GCC: 4.0
-Distribution: 10.6, 10.7, 10.8
+Distribution: 10.6, 10.7, 10.8, 10.9
UseMaxBuildJobs: false
#
Source: ftp://ftp.%n.ac.uk/%n/%v/%n-%v-core-src.tar.gz
@@ -16,7 +16,7 @@
Source3-MD5: 21568dd2475505929573a3fd452c538f
#
PatchFile: %n.patch
-PatchFile-MD5: b170eaad8f6926d7be9fee5abe017bd3
+PatchFile-MD5: ba09403eb1de30588e5dd13c08840b1e
#
#
#
@@ -56,8 +56,8 @@
blas/lapak to avoid run-time errors. I use that in all versions now,
but plan to get rid of this as soon as possible.
<<
-Depends: x11, tcltk, blt, gcc47-shlibs, gc-shlibs, %N-shlibs (= %v-%r)
-BuildDepends: gcc47, tcltk-dev, x11-dev, xmkmf (>= 1.0.2-3), fink (>= 0.24.12)
+Depends: x11, tcltk, blt, gcc48-shlibs, gc-shlibs, %N-shlibs (= %v-%r)
+BuildDepends: gcc48, tcltk-dev, x11-dev, xmkmf (>= 1.0.2-3), fink (>= 0.24.12)
BuildDependsOnly: False
BuildConflicts: gpp4-dev, gpp4, ssm, ssm-dev, mmdb, mmdb-dev, clipper,
clipper-bin, clipper-dev, ccp4-onlylibs-dev, python
Conflicts: <<
@@ -151,12 +151,16 @@
# touch .agree2ccp4v6
#
- F_LIBS="-L%p/lib/gcc4.7/lib -lgfortran " \
+if [[ $(sw_vers -productVersion | cut -d. -f1-2) > 10.8 ]]; then
+ perl -pi -e 's|"IMAKECPP=/usr/bin/cpp xmkmf"|"IMAKECPP=%p/bin/llvm-cpp-4.2
xmkmf"|g' configure
+fi
+
+ F_LIBS="%p/lib/gcc4.8/lib/libgfortran.dylib " \
./configure --disable-cctbx --disable-phaser --with-netlib-lapack
--with-shared-libs --with-x Darwin
#
# 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
+( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran
-L%p/lib/gcc4.8/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
@@ -181,7 +185,7 @@
#### rapper fix by re-configuring. Requires further intervention in the
InstallScript
cd $CCP4/src/rapper
-./configure --prefix=$PWD CC=%p/bin/gcc-4 CXX=%p/bin/g++-4
+./configure --prefix=$PWD CC=/usr/bin/gcc CXX=/usr/bin/g++
#################
#################
@@ -324,17 +328,17 @@
install_name_tool -id
%p/lib/%n-%v/cctbx/cctbx_build/lib/libboost_python.dylib
lib/cctbx/cctbx_build/lib/libboost_python.dylib
#
# Fix linking to wrong library for afro and bp3
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/afro
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/bp3
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/gcx
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/mapro
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/afro
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/bp3
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/gcx
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/mapro
# Fix linking to wrong library for pointless and aimless
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/pointless
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/aimless
- install_name_tool -change %p/lib/gcc4.7/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/othercell
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/pointless
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/aimless
+ #install_name_tool -change %p/lib/gcc4.8/lib/libstdc++.6.dylib
/usr/lib/libstdc++.6.dylib bin/othercell
# Fix for linking problem with rapper
- install_name_tool -change %p/lib/%n-%v/libgc.1.dylib
%p/lib/libgc.1.dylib bin/rapper
- install_name_tool -change /usr/lib/libstdc++.6.dylib
%p/lib/gcc4.7/lib/libstdc++.6.dylib bin/rapper
+ #install_name_tool -change %p/lib/%n-%v/libgc.1.dylib
%p/lib/libgc.1.dylib bin/rapper
+ #install_name_tool -change /usr/lib/libstdc++.6.dylib
%p/lib/gcc4.8/lib/libstdc++.6.dylib bin/rapper
#
cd %b
mkdir -p %i/lib
@@ -508,6 +512,10 @@
rather than those of this package. (Hopefully that will soon change.)
Thanks to Jack Howarth and Huw Jenkins for many helpful improvements.
+
+ Backport commit d923334022938240c43c167d66549b1211aed2ba from
+ https://github.com/ivmai/libatomic_ops to allow compilation of rapper
+ with clang.
<<
DocFiles: <<
README CHANGES COPYING PROBLEMS INSTALL academic_software_licence.pdf
academic_software_licence.rtf
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
