summarylogtreecommitdiffstats
path: root/fix-jdk-version-detection.patch
diff options
context:
space:
mode:
authorZach Callear2018-05-01 09:11:03 -0600
committerZach Callear2018-05-01 09:11:03 -0600
commite1e9542805ca173ef9439b8f1a4a140c813cd4a4 (patch)
treeb33fb94635e792c2e0288adbe359fba7aa0c8210 /fix-jdk-version-detection.patch
parentba6097a7abe80c22793fef9884703fd9a93ec44e (diff)
downloadaur-e1e9542805ca173ef9439b8f1a4a140c813cd4a4.tar.gz
Fix _JAVA_OPTIONS breaking JDK version detection
Diffstat (limited to 'fix-jdk-version-detection.patch')
-rw-r--r--fix-jdk-version-detection.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/fix-jdk-version-detection.patch b/fix-jdk-version-detection.patch
new file mode 100644
index 00000000000..fbe526976e1
--- /dev/null
+++ b/fix-jdk-version-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
+index ace6f7d..c13cde7 100644
+--- a/common/autoconf/boot-jdk.m4
++++ b/common/autoconf/boot-jdk.m4
+@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -F version`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]