Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15847

Modified Files:
        xraylib.info 
Log Message:
Fix 10.6/i386 (also 10.5/x86_64) Java test failure.

Index: xraylib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/xraylib.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xraylib.info        6 Oct 2011 16:39:12 -0000       1.1
+++ xraylib.info        17 Nov 2011 18:18:25 -0000      1.2
@@ -28,6 +28,22 @@
 --disable-static
 <<
 
+PatchScript: <<
+       #!/bin/sh -ev
+       os=`uname -r | cut -d. -f1`
+       # check for 10.5 and 10.6 cases where the default architecture doesn't
+       # match Fink's
+       case $os in
+               # 10.5/x86_64
+               9) if [ "%m" = "x86_64" ] ; then jsubst=" -d64" ; fi ;;
+               # 10.6/i386
+               10) if [ "%m" = "i386" ] ; then jsubst=" -d32" ; fi ;;
+               # all others
+               *) jsubst="" ;;
+       esac
+       perl -pi -e "s/(JAVA\))/\1$jsubst/" example/Makefile.in
+<<
+
 CompileScript: <<
 %{default_script}
 fink-package-precedence .
@@ -53,6 +69,9 @@
 
 Use install_name_tool on the java lib so that it has an absolute install_name. 
 
+Patch examples/Makefile.in so that test 7 in the test suite uses the the same
+architecture for the Java virtual machine as the Fink tree.
+
 The text files are in the -shlibs package because they are used at runtime.
 <<
 


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to