mirror of
https://git.freebsd.org/ports.git
synced 2025-06-27 07:30:32 -04:00
e648e6559f
- Fix build after recent switch to OpenJDK 1.7 [1] - Remove HOME from MAKE_ENV, it's now set in bsd.port.mk PR: 191523 Submitted by: kenji@k2r.org
56 lines
2.5 KiB
Text
56 lines
2.5 KiB
Text
--- ./configure.orig 2011-07-20 08:15:42.000000000 +0000
|
|
+++ ./configure 2013-10-23 11:59:48.722499060 +0000
|
|
@@ -10719,7 +10719,7 @@
|
|
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
|
D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
|
|
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
|
|
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
|
|
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
|
fi
|
|
fi
|
|
|
|
@@ -10850,7 +10850,7 @@
|
|
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
|
D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
|
|
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
|
|
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
|
|
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
|
fi
|
|
fi
|
|
|
|
@@ -12226,14 +12226,15 @@
|
|
|
|
public class conftest {
|
|
public static void main(String[] argv) {
|
|
- String minVersion="1.8.4";
|
|
+ int minVersion=10804;
|
|
int[] vers = new int[3];
|
|
try { H5.H5get_libversion(vers); }
|
|
catch (Throwable ex) {System.exit(-1);}
|
|
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
|
|
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
|
|
|
|
System.out.println(ver);
|
|
- if (minVersion.compareTo(ver) > 0) {
|
|
+ if (minVersion > Version) {
|
|
System.exit(-1);
|
|
}
|
|
|
|
@@ -12281,14 +12281,15 @@
|
|
|
|
public class conftest {
|
|
public static void main(String[] argv) {
|
|
- String minVersion="1.8.4";
|
|
+ int minVersion=10804;
|
|
int[] vers = new int[3];
|
|
try { H5.H5get_libversion(vers); }
|
|
catch (Throwable ex) {System.exit(-1);}
|
|
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
|
|
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
|
|
|
|
System.out.println(ver);
|
|
- if (minVersion.compareTo(ver) != 0) {
|
|
+ if (minVersion > Version) {
|
|
System.exit(-1);
|
|
}
|
|
|