From 8118704de68b0fe5edfc9d98cf62536b08eae5f9 Mon Sep 17 00:00:00 2001 From: Simon Frankenberger Date: Wed, 25 Mar 2020 08:05:18 +0100 Subject: community/openjdk11: Cleanup and unify with other openjdk aports --- community/openjdk11/fix-bootjdk-check.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 community/openjdk11/fix-bootjdk-check.patch (limited to 'community/openjdk11/fix-bootjdk-check.patch') diff --git a/community/openjdk11/fix-bootjdk-check.patch b/community/openjdk11/fix-bootjdk-check.patch new file mode 100644 index 0000000000..04a1c94ff9 --- /dev/null +++ b/community/openjdk11/fix-bootjdk-check.patch @@ -0,0 +1,15 @@ +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 | $EGREP '\"10([\.+-].*)?\"|\"9([\.+-].*)?\"'`] -- cgit v1.2.3