diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2020-03-25 08:05:18 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-25 12:41:14 +0000 |
| commit | 8118704de68b0fe5edfc9d98cf62536b08eae5f9 (patch) | |
| tree | bde4dde143bf9414cace6236203eb1b85e768eb6 /community/openjdk11/fix-bootjdk-check.patch | |
| parent | 1dac0e83f4cc792086d453befd08cca47888a07d (diff) | |
| download | aports-8118704de68b0fe5edfc9d98cf62536b08eae5f9.tar.bz2 aports-8118704de68b0fe5edfc9d98cf62536b08eae5f9.tar.xz | |
community/openjdk11: Cleanup and unify with other openjdk aports
Diffstat (limited to 'community/openjdk11/fix-bootjdk-check.patch')
| -rw-r--r-- | community/openjdk11/fix-bootjdk-check.patch | 15 |
1 files changed, 15 insertions, 0 deletions
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([\.+-].*)?\"'`] |