From 1f0ed457fde6c2f7e78f718079044082bd3fedce Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Sun, 16 Jun 2013 17:05:55 +0000 Subject: - Fix build with JDK 1.7. [1] - Propagate Make environment to Ant to use the correct JDK and not just the one that Ant was built with. PR: 173505 [1] Submitted by: James Raynard [1] Patch by: Piotr Smyrak [1] Obtained from: https://launchpad.net/ubuntu/+source/java3d/1.5.2+dfsg-8 [1] --- java/java3d/files/patch-freebsd | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'java/java3d/files/patch-freebsd') diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd index 13df270ee357..066f2ac3ebb8 100644 --- a/java/java3d/files/patch-freebsd +++ b/java/java3d/files/patch-freebsd @@ -88,6 +88,14 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/bu +@@ -347,6 +360,7 @@ + + + ++ + + + diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml --- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 +++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200 -- cgit v1.2.3