From: Alexander H. <ale...@us...> - 2014-10-24 03:54:15
|
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/octmods In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6324 Modified Files: java-oct.info Log Message: Needed tweaks. Index: java-oct.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/octmods/java-oct.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- java-oct.info 23 Oct 2014 02:12:13 -0000 1.1 +++ java-oct.info 24 Oct 2014 03:54:12 -0000 1.2 @@ -2,7 +2,7 @@ Package: java-oct%type_pkg[oct] Version: 1.2.9 Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3 3.6.4), forge (java) -Revision: 1 +Revision: 2 Distribution: ( %type_pkg[oct] << 364 ) 10.7, ( %type_pkg[oct] << 364 ) 10.8 Maintainer: Alexander Hansen <ale...@us...urceforge.ent> @@ -30,6 +30,8 @@ PatchScript: << perl -pi -e 's/echo -n/echo/g' src/configure perl -pi -e 's,-I\$\{JAVA_HOME\}/include,-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers,g' src/configure + # don't look for the deprecated libjvm_compat.dylib in this day and age + perl -pi -e 's|Libraries/libjvm_compat.dylib|Libraries/libverify.dylib|g' src/configure << NoSetCPPFLAGS: true @@ -40,6 +42,9 @@ CompileScript: << #!/bin/sh -ev +# make sure configure looks at the right java/javac +export PATH="/System/Library/Frameworks/JavaVM.framework/Home/bin:$PATH" + pkgsrc=%type_raw[forge] pushd src @@ -47,6 +52,9 @@ make popd +# octave-forge-compile.sh wants JAVA_HOME set +export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" + %p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v %type_raw[oct] %b %i $pkgsrc ./octave-forge-compile.sh << |