Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27258
Modified Files:
mosflm-small.info mosflm.info
Log Message:
fixed run-time error in mosflm on intel
Index: mosflm-small.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm-small.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mosflm-small.info 23 May 2006 13:57:27 -0000 1.9
+++ mosflm-small.info 28 May 2006 03:11:23 -0000 1.10
@@ -1,25 +1,26 @@
Package: mosflm-small
Version: 6.2.6
-Revision: 1003
-#Architecture: powerpc
+Revision: 1007
Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver626/build-it-yourself/mosflm626.tgz
SourceDirectory: mosflm626
Source-MD5: 7d3313d1542a2d341661cb90fb0e45ad
-Depends: x11, (%m = "powerpc") ccp4 (>= 6.0-1008), (%m = "i386")
ccp4-gfortran (>= 6.0-1008), libjpeg-shlibs, libgettext3-shlibs
-BuildDepends: (%m = "powerpc") g77, (%m = "i386") gcc4 (>= 2:4.1.99-20060515),
(%m = "powerpc") ccp4 (>= 6.0-1008) , (%m = "i386") ccp4-gfortran (>=
6.0-1008), x11, libjpeg, libgettext3-shlibs, (%m = "powerpc") ccp4-dev (>=
6.0-1008) , (%m = "i386") ccp4-gfortran-dev (>= 6.0-1008)
+Depends: x11, ccp4 (>= 6.0-1008), libjpeg-shlibs, libgettext3-shlibs,
gcc4-shlibs (>= 2:4.1.99-20060515)
+BuildDepends: gcc4 (>= 2:4.1.99-20060515), ccp4-dev (>= 6.0-1008), x11,
libjpeg, libgettext3-shlibs
#
PatchScript: <<
-#!/bin/zsh -ef
-perl -pi.bak -e 's|-lcc_dynamic||g' setup
+#!/bin/zsh -efv
if [[ $(uname -p) == i386 ]];then
perl -pi -e 's|HOSTTYPE == powermac|HOSTTYPE == intel-pc|g' build
- perl -pi -e 's|-fno-globals||g' build
+fi
+ perl -pi -e 's|-lcc_dynamic||g' setup
perl -pi -e 's|-fno-globals||g' setup
+ perl -pi -e 's|-O1|-O0|g' setup
+ perl -pi -e 's|-lxdl_view|-lxdl_view -lgfortran -L%p/lib/gcc4/lib|g' setup
+ perl -pi -e 's|A\(IK\) = A\(IK\) / -BIGA| A\(IK\) = \( A\(IK\) \) / \(
-BIGA \)|g' mosflm/unoptimizable.f
perl -pi -e 's|f77|gfortran|g' setup
-fi
<<
CompileScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
export MOSROOT=$PWD:h
./to_small.csh
./build
@@ -27,7 +28,7 @@
mv ipmosflm ipmosflm-small
<<
InstallScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
mkdir -p %i/bin
cd bin
cp ipmosflm-* %i/bin
Index: mosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mosflm.info 23 May 2006 13:57:27 -0000 1.8
+++ mosflm.info 28 May 2006 03:11:23 -0000 1.9
@@ -1,34 +1,36 @@
Package: mosflm
Version: 6.2.6
-Revision: 1003
-#Architecture: powerpc
+Revision: 1007
Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver626/build-it-yourself/mosflm626.tgz
SourceDirectory: mosflm626
Source-MD5: 7d3313d1542a2d341661cb90fb0e45ad
-Depends: x11, (%m = "powerpc") ccp4 (>= 6.0-1008), (%m = "i386")
ccp4-gfortran (>= 6.0-1008), libjpeg-shlibs, libgettext3-shlibs
-BuildDepends: (%m = "powerpc") g77, (%m = "i386") gcc4, (%m = "powerpc") ccp4
(>= 6.0-1008) , (%m = "i386") ccp4-gfortran (>= 6.0-1008), x11, libjpeg,
libgettext3-shlibs, (%m = "powerpc") ccp4-dev (>= 6.0-1008) , (%m = "i386")
ccp4-gfortran-dev (>= 6.0-1008)
+Depends: x11, ccp4 (>= 6.0-1008), libjpeg-shlibs, libgettext3-shlibs,
gcc4-shlibs (>= 2:4.1.99-20060515)
+BuildDepends: gcc4 (>= 2:4.1.99-20060515), ccp4-dev (>= 6.0-1008), x11,
libjpeg, libgettext3-shlibs
#
#BuildDepends: (%m = "powerpc") foo, (%m = "i386") bar, bas
#The on ppc you have a builddepends on foo and bas, and on intel its on bar
and bas.
PatchScript: <<
-#!/bin/zsh -ef
-perl -pi.bak -e 's|-lcc_dynamic||g' setup
+#!/bin/zsh -efv
if [[ $(uname -p) == i386 ]];then
perl -pi -e 's|HOSTTYPE == powermac|HOSTTYPE == intel-pc|g' build
- perl -pi -e 's|-fno-globals||g' build
+fi
+ perl -pi -e 's|-lcc_dynamic||g' setup
perl -pi -e 's|-fno-globals||g' setup
+ perl -pi -e 's|-O1|-O0|g' setup
+ perl -pi -e 's|-lxdl_view|-lxdl_view -lgfortran -L%p/lib/gcc4/lib|g' setup
+ perl -pi -e 's|A\(IK\) = A\(IK\) / -BIGA| A\(IK\) = \( A\(IK\) \) / \(
-BIGA \)|g' mosflm/unoptimizable.f
perl -pi -e 's|f77|gfortran|g' setup
-fi
<<
CompileScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
export MOSROOT=$PWD:h
+export FOPTIM="-O0"
./build
cd bin
mv ipmosflm ipmosflm-626
<<
InstallScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
mkdir -p %i/bin
cd bin
cp ipmosflm-* %i/bin/.
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits