openjdk8: Refresh patchfiles

Closes: https://trac.macports.org/ticket/67344
This commit is contained in:
Ryan Schmidt
2023-05-05 12:11:14 -05:00
parent 05adaee0b6
commit 89577c32af
4 changed files with 161 additions and 189 deletions
-1
View File
@@ -14,7 +14,6 @@ set build 07
version ${major}u${update}
revision 0
categories java devel
platforms darwin
supported_archs ppc x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
@@ -4,16 +4,9 @@ Date: Wed, 28 Sep 2022 18:00:50 +0200
Subject: [PATCH] Support XCode 3-14
Co-authored-by: usersxx <97012123+usersxx@users.noreply.github.com>
---
common/autoconf/generated-configure.sh | 4 ++--
common/autoconf/toolchain.m4 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
index 71fabf4dbb3..7f97eb5a0b2 100644
--- common/autoconf/generated-configure.sh
+++ common/autoconf/generated-configure.sh
@@ -27063,8 +27063,8 @@ fi
@@ -27373,8 +27373,8 @@
# Fail-fast: verify we're building on a supported Xcode version
XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
@@ -24,8 +17,6 @@ index 71fabf4dbb3..7f97eb5a0b2 100644
fi
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
diff --git common/autoconf/toolchain.m4 common/autoconf/toolchain.m4
index ab0167a6191..7dd7ff6d78e 100644
--- common/autoconf/toolchain.m4
+++ common/autoconf/toolchain.m4
@@ -290,8 +290,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
@@ -39,6 +30,3 @@ index ab0167a6191..7dd7ff6d78e 100644
fi
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
--
2.37.3
@@ -2,14 +2,6 @@ From c9806a9d61fcac79f4795c1e93a21036382ab4d4 Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 28 Sep 2022 18:03:12 +0200
Subject: [PATCH] Ignore `__NSAutoreleaseNoPool` errors
---
common/autoconf/boot-jdk.m4 | 4 +-
common/autoconf/generated-configure.sh | 88 +++++++++++++-------------
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git common/autoconf/boot-jdk.m4 common/autoconf/boot-jdk.m4
index 5be15b86967..3b32c19a42c 100644
--- common/autoconf/boot-jdk.m4
+++ common/autoconf/boot-jdk.m4
@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
@@ -30,11 +22,9 @@ index 5be15b86967..3b32c19a42c 100644
AC_MSG_RESULT([$BOOT_JDK_VERSION])
fi # end check jdk version
fi # end check rt.jar
diff --git common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
index 7f97eb5a0b2..db4a2f9cbd8 100644
--- common/autoconf/generated-configure.sh
+++ common/autoconf/generated-configure.sh
@@ -20305,7 +20305,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -20360,7 +20360,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -43,7 +33,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -20446,7 +20446,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -20512,7 +20512,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -52,7 +42,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -20637,7 +20637,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -20703,7 +20703,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -61,7 +51,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -20778,7 +20778,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -20855,7 +20855,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -70,7 +60,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -20955,7 +20955,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -21043,7 +21043,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -79,7 +69,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -21096,7 +21096,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -21195,7 +21195,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -88,7 +78,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -21143,7 +21143,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -21242,7 +21242,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -97,7 +87,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -21284,7 +21284,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -21394,7 +21394,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -106,7 +96,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -21471,7 +21471,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -21581,7 +21581,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -115,7 +105,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -21612,7 +21612,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -21733,7 +21733,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -124,7 +114,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -21686,7 +21686,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -21807,7 +21807,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -133,7 +123,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -21827,7 +21827,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -21959,7 +21959,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -142,7 +132,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -21866,7 +21866,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -21998,7 +21998,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -151,7 +141,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22007,7 +22007,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -22150,7 +22150,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -160,7 +150,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -22074,7 +22074,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -22217,7 +22217,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -169,7 +159,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22215,7 +22215,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -22369,7 +22369,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -178,7 +168,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -22254,7 +22254,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -22408,7 +22408,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -187,7 +177,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22395,7 +22395,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -22560,7 +22560,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -196,7 +186,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -22462,7 +22462,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -22627,7 +22627,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -205,7 +195,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22603,7 +22603,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -22779,7 +22779,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -214,7 +204,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -22642,7 +22642,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -22818,7 +22818,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -223,7 +213,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22783,7 +22783,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -22970,7 +22970,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -232,7 +222,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -22850,7 +22850,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -23037,7 +23037,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -241,7 +231,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -22991,7 +22991,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -23189,7 +23189,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -250,7 +240,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23030,7 +23030,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -23228,7 +23228,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -259,7 +249,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -23171,7 +23171,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -23380,7 +23380,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -268,7 +258,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23225,7 +23225,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -23434,7 +23434,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -277,7 +267,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -23366,7 +23366,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -23586,7 +23586,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -286,7 +276,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23403,7 +23403,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -23623,7 +23623,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -295,7 +285,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -23544,7 +23544,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -23775,7 +23775,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -304,7 +294,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23599,7 +23599,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -23830,7 +23830,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -313,7 +303,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -23740,7 +23740,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -23982,7 +23982,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -322,7 +312,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23777,7 +23777,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24019,7 +24019,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -331,7 +321,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -23918,7 +23918,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -24171,7 +24171,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -340,7 +330,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -23972,7 +23972,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24225,7 +24225,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -349,7 +339,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -24113,7 +24113,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -24377,7 +24377,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -358,7 +348,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -24150,7 +24150,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24414,7 +24414,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -367,7 +357,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -24291,7 +24291,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -24566,7 +24566,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -376,7 +366,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -24346,7 +24346,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24621,7 +24621,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -385,7 +375,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -24487,7 +24487,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -24773,7 +24773,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -394,7 +384,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -24524,7 +24524,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24810,7 +24810,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -403,7 +393,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -24665,7 +24665,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -24962,7 +24962,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -412,7 +402,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
@@ -24701,7 +24701,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
@@ -24998,7 +24998,7 @@
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -421,7 +411,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -24842,7 +24842,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
@@ -25150,7 +25150,7 @@
$as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
@@ -430,6 +420,3 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
--
2.37.3
File diff suppressed because it is too large Load Diff