Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1031
Modified Files:
ccp4.info
Log Message:
fix for bp3 seg fault and correct ENV var for BALBES_ROOT
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccp4.info 12 Sep 2012 06:31:56 -0000 1.8
+++ ccp4.info 16 Sep 2012 19:16:51 -0000 1.9
@@ -1,7 +1,8 @@
Package: ccp4
Version: 6.3.0
-Revision: 1
+Revision: 2
GCC: 4.0
+Distribution: 10.6, 10.7, 10.8
UseMaxBuildJobs: false
#
Source: ftp://ftp.%n.ac.uk/%n/%v/%n-%v-core-src.tar.gz
@@ -103,9 +104,10 @@
perl -pi.bak -e 's|ccp4_first_in_path\ =\ 1|ccp4_first_in_path\ =\ 0|g'
include/ccp4.setup*
perl -pi.bak -e 's|setenv GFORTRAN_UNBUFFERED_ALL Y|# setenv
GFORTRAN_UNBUFFERED_ALL Y|g' include/ccp4.setup*
perl -pi.bak -e 's|export GFORTRAN_UNBUFFERED_ALL|# export
GFORTRAN_UNBUFFERED_ALL|g' include/ccp4.setup*
- perl -pi -e 's|Please get the person who installed CCP4i to run
it|Please issue the command \\\"sudo -E ccp4i\\\"|g' share/ccp4i/src/system.tcl
- perl -pi -e 's|CCP4/ccp4i|CCP4/share/ccp4i|g' include/ccp4.setup*
- perl -pi -e 's|\{CCP4\}/ccp4i|\{CCP4\}/share/ccp4i|g' include/ccp4.setup*
+ perl -pi.bak -e 's|share/balbes/BALBES_0.0.1|share/BALBES/Package|g'
include/ccp4.setup*
+ perl -pi.bak -e 's|Please get the person who installed CCP4i to run
it|Please issue the command \\\"sudo -E ccp4i\\\"|g' share/ccp4i/src/system.tcl
+ perl -pi.bak -e 's|CCP4/ccp4i|CCP4/share/ccp4i|g' include/ccp4.setup*
+ perl -pi.bak -e 's|\{CCP4\}/ccp4i|\{CCP4\}/share/ccp4i|g'
include/ccp4.setup*
if [[ $(sw_vers -productVersion) < 10.6 ]]; then
true
else
@@ -216,7 +218,7 @@
#### Try rapper fix here
cd $CCP4/src/rapper
-./configure --prefix=$PWD CC=/usr/bin/clang CXX=/usr/bin/clang++ CFLAGS="-O3"
+./configure --prefix=$PWD CC=%p/bin/gcc-4 CXX=%p/bin/g++-4
#################
#################
@@ -357,7 +359,12 @@
# Fix for relative path in the install_name of libboost_python.dylib
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
#
cd %b
mkdir -p %i/lib
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://ad.doubleclick.net/clk;258768047;13503038;j?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
