diff options
Diffstat (limited to 'repo/system/openjdk11/fix-bootjdk-check.patch')
| -rw-r--r-- | repo/system/openjdk11/fix-bootjdk-check.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/repo/system/openjdk11/fix-bootjdk-check.patch b/repo/system/openjdk11/fix-bootjdk-check.patch new file mode 100644 index 0000000..b34a1b2 --- /dev/null +++ b/repo/system/openjdk11/fix-bootjdk-check.patch @@ -0,0 +1,19 @@ +Subject: Fix detection of bootjdk on configure +Upstream: No +Author: Simon Frankenberger <simon-alpine@fraho.eu> + +The alpine builders print out a warning about sched_getaffinity() not working. +This causes the version check for the boot jdk to fail. +Patch the command to determine the version number to ignore any errors and warnings. + +--- old/make/autoconf/boot-jdk.m4 ++++ new/make/autoconf/boot-jdk.m4 +@@ -74,7 +74,7 @@ + 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 version | $HEAD -n 1` + + # Extra M4 quote needed to protect [] in grep expression. + [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION \ |