Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10849
Modified Files:
mosflm-small.info mosflm.info
Log Message:
mosflm new version that works on both platforms
Index: mosflm-small.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm-small.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mosflm-small.info 14 May 2006 04:48:28 -0000 1.7
+++ mosflm-small.info 15 May 2006 06:16:06 -0000 1.8
@@ -1,18 +1,26 @@
Package: mosflm-small
Version: 6.2.6
-Revision: 1001
-Architecture: powerpc
+Revision: 1002
+#Architecture: powerpc
Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver626/build-it-yourself/mosflm626.tgz
SourceDirectory: mosflm626
Source-MD5: 7d3313d1542a2d341661cb90fb0e45ad
-Depends: x11, ccp4 (>= 6.0-1002), libjpeg-shlibs, libgettext3-shlibs
-BuildDepends: g77, ccp4 (>= 6.0-1002), x11, libjpeg, libgettext3-shlibs,
ccp4-dev (>= 6.0-1002)
+Depends: x11, (%m = "powerpc") ccp4 (>= 6.0-1003), (%m = "i386")
ccp4-gfortran (>= 6.0-1006), libjpeg-shlibs, libgettext3-shlibs
+BuildDepends: (%m = "powerpc") g77, (%m = "i386") gcc4, (%m = "powerpc") ccp4
(>= 6.0-1003) , (%m = "i386") ccp4-gfortran (>= 6.0-1006), x11, libjpeg,
libgettext3-shlibs, (%m = "powerpc") ccp4-dev (>= 6.0-1003) , (%m = "i386") dev
(>= 6.0-1006)
+#
PatchScript: <<
#!/bin/zsh -ef
perl -pi.bak -e 's|-lcc_dynamic||g' setup
+if [[ $(uname -p) == i386 ]];then
+ perl -pi -e 's|HOSTTYPE == powermac|HOSTTYPE == intel-pc|g' build
+ perl -pi -e 's|-fno-globals||g' build
+ perl -pi -e 's|-fno-globals||g' setup
+ perl -pi -e 's|f77|gfortran|g' setup
+fi
<<
CompileScript: <<
#!/bin/zsh -ef
+export MOSROOT=$PWD:h
./to_small.csh
./build
cd bin
Index: mosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mosflm.info 14 May 2006 04:48:28 -0000 1.6
+++ mosflm.info 15 May 2006 06:16:06 -0000 1.7
@@ -1,19 +1,28 @@
Package: mosflm
Version: 6.2.6
-Revision: 1001
-Architecture: powerpc
+Revision: 1002
+#Architecture: powerpc
Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver626/build-it-yourself/mosflm626.tgz
SourceDirectory: mosflm626
Source-MD5: 7d3313d1542a2d341661cb90fb0e45ad
-Depends: x11, ccp4 (>= 6.0-1002), libjpeg-shlibs, libgettext3-shlibs
-BuildDepends: g77, ccp4 (>= 6.0-1002), x11, libjpeg, libgettext3-shlibs,
ccp4-dev (>= 6.0-1002)
+Depends: x11, (%m = "powerpc") ccp4 (>= 6.0-1003), (%m = "i386")
ccp4-gfortran (>= 6.0-1006), libjpeg-shlibs, libgettext3-shlibs
+BuildDepends: (%m = "powerpc") g77, (%m = "i386") gcc4, (%m = "powerpc") ccp4
(>= 6.0-1003) , (%m = "i386") ccp4-gfortran (>= 6.0-1006), x11, libjpeg,
libgettext3-shlibs, (%m = "powerpc") ccp4-dev (>= 6.0-1003) , (%m = "i386") dev
(>= 6.0-1006)
+#
+#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
-print $PWD
perl -pi.bak -e 's|-lcc_dynamic||g' setup
+if [[ $(uname -p) == i386 ]];then
+ perl -pi -e 's|HOSTTYPE == powermac|HOSTTYPE == intel-pc|g' build
+ perl -pi -e 's|-fno-globals||g' build
+ perl -pi -e 's|-fno-globals||g' setup
+ perl -pi -e 's|f77|gfortran|g' setup
+fi
<<
CompileScript: <<
#!/bin/zsh -ef
+export MOSROOT=$PWD:h
./build
cd bin
mv ipmosflm ipmosflm-626
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits