mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

- Fix build with jdk16

Browse Source 
PR:		127112
Submitted by:	maintainer
This commit is contained in:
Martin Wilke 2008-09-06 16:26:10 +00:00
parent b02313d26b
commit eb52734aa3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=220001
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
science/ovt/files/patch-configure
View File

@ -1,5 +1,9 @@
--- configure.orig Tue Mar 23 22:21:46 2004
+++ configure Thu Oct 5 13:48:28 2006
Save the attached patch as science/ovt/files/patch-configure
Patch attached with submission follows:
--- configure.orig 2004-03-23 22:21:46.000000000 +0100
+++ configure 2008-09-05 14:56:01.000000000 +0200
@@ -2496,8 +2496,8 @@
echo "${ECHO_T}$ac_cv_jdk_version" >&6
case "$ac_cv_jdk_version" in
@ -19,7 +23,7 @@
;;
1.4*)
JDK_VERSION_STRING=$ac_cv_jdk_version
@@ -2515,7 +2516,16 @@
@@ -2515,7 +2516,25 @@
JAVAHFLAGS=""
JAVA_INCLUDES="$ac_cv_java_home/include"
JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
@ -33,11 +37,20 @@
+ JAVAHFLAGS=""
+ JAVA_INCLUDES="$ac_cv_java_home/include"
+ JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
+ JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
+ ;;
+1.6*)
+ JDK_VERSION_STRING=$ac_cv_jdk_version
+ JDK_VERSION=16
+ JAVACFLAGS="-classpath ."
+ JAVAHFLAGS=""
+ JAVA_INCLUDES="$ac_cv_java_home/include"
+ JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
+ JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
;;
*)
{ { echo "$as_me:$LINENO: error: unrecognized JDK version:$ac_cv_jdk_version" >&5
@@ -2527,6 +2537,7 @@
@@ -2527,6 +2546,7 @@
@ -45,7 +58,7 @@
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3627,6 +3638,7 @@
@@ -3627,6 +3647,7 @@
s,@JAVA@,$JAVA,;t t
s,@JAVA_INCLUDES@,$JAVA_INCLUDES,;t t
s,@JAVA_INCLUDES_OS@,$JAVA_INCLUDES_OS,;t t
@ -53,3 +66,5 @@
s,@ac_cv_javac@,$ac_cv_javac,;t t
s,@ac_cv_jikes@,$ac_cv_jikes,;t t
s,@JAVAC@,$JAVAC,;t t