diff options
author | Stefan Walter <stefan@FreeBSD.org> | 2013-06-16 17:05:55 +0000 |
---|---|---|
committer | Stefan Walter <stefan@FreeBSD.org> | 2013-06-16 17:05:55 +0000 |
commit | 1f0ed457fde6c2f7e78f718079044082bd3fedce (patch) | |
tree | 0ec69890271501d6cd2384ccff717fa4bbc3c50b /java/java3d/files/patch-freebsd | |
parent | - Fix ownership and permissions of the installed files. (diff) |
- 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 <james.raynard@pobox.com> [1]
Patch by: Piotr Smyrak <piotr.smyrak@gmail.com> [1]
Obtained from: https://launchpad.net/ubuntu/+source/java3d/1.5.2+dfsg-8 [1]
Notes
Notes:
svn path=/head/; revision=321060
Diffstat (limited to 'java/java3d/files/patch-freebsd')
-rw-r--r-- | java/java3d/files/patch-freebsd | 8 |
1 files changed, 8 insertions, 0 deletions
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 <property name="bldType" value="opt"/> <property name="javahCoreSrc" location="${src}/classes/share/javax/media/j3d"/> +@@ -347,6 +360,7 @@ + <javah destdir="${javahCoreTarget}" force="yes"> + <classpath> + <pathelement path="${build}/${platform}/${bldType}/classes"/> ++ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/> + </classpath> + + <class name="javax.media.j3d.Background"/> 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 |