<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3c91ea8500caad4d66e0f6bf500a7cbc6aeba0f7">https://github.com/macports/macports-ports/commit/3c91ea8500caad4d66e0f6bf500a7cbc6aeba0f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3c91ea8500caad4d66e0f6bf500a7cbc6aeba0f7
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Fri May 6 14:21:06 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk8: update patches
</span>---
java/openjdk8/files/patch-openjdk8-xcode.diff | 28 ++++++++++++++++++++++++++
java/openjdk8/files/patch-openjdk8-xcode1.diff | 14 -------------
2 files changed, 28 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/patch-openjdk8-xcode.diff b/java/openjdk8/files/patch-openjdk8-xcode.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f80cc360277
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/files/patch-openjdk8-xcode.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Added support for Xcode 3 - Xcode 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/toolchain.m4.orig 2022-03-13 11:37:54.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/toolchain.m4 2022-03-13 11:43:25.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,8 +290,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fail-fast: verify we're building on a supported Xcode version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "${XC_VERSION_PARTS[[0]]}" != "3" -a "${XC_VERSION_PARTS[[0]]}" != "4" -a "${XC_VERSION_PARTS[[0]]}" != "5" -a "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "7" -a "${XC_VERSION_PARTS[[0]]}" != "8" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" -a "${XC_VERSION_PARTS[[0]]}" != "13" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([Xcode 3-13 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some versions of Xcode command line tools install gcc and g++ as symlinks to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/autoconf/generated-configure.sh.orig 2022-03-13 11:37:54.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/autoconf/generated-configure.sh 2022-03-13 11:46:00.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27049,8 +27049,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fail-fast: verify we're building on a supported Xcode version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "${XC_VERSION_PARTS[0]}" != "6" -a "${XC_VERSION_PARTS[0]}" != "9" -a "${XC_VERSION_PARTS[0]}" != "10" -a "${XC_VERSION_PARTS[0]}" != "11" -a "${XC_VERSION_PARTS[0]}" != "12" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "${XC_VERSION_PARTS[0]}" != "3" -a "${XC_VERSION_PARTS[0]}" != "4" -a "${XC_VERSION_PARTS[0]}" != "5" -a "${XC_VERSION_PARTS[0]}" != "6" -a "${XC_VERSION_PARTS[0]}" != "7" -a "${XC_VERSION_PARTS[0]}" != "8" -a "${XC_VERSION_PARTS[0]}" != "9" -a "${XC_VERSION_PARTS[0]}" != "10" -a "${XC_VERSION_PARTS[0]}" != "11" -a "${XC_VERSION_PARTS[0]}" != "12" -a "${XC_VERSION_PARTS[0]}" != "13" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ as_fn_error $? "Xcode 3-13 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some versions of Xcode command line tools install gcc and g++ as symlinks to
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/patch-openjdk8-xcode1.diff b/java/openjdk8/files/patch-openjdk8-xcode1.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e130b49bd7c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/files/patch-openjdk8-xcode1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Added support for Xcode 6 - Xcode 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/autoconf/toolchain.m4.orig 2022-03-13 11:37:54.000000000 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/autoconf/toolchain.m4 2022-03-13 11:43:25.000000000 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -290,8 +290,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fail-fast: verify we're building on a supported Xcode version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "7" -a "${XC_VERSION_PARTS[[0]]}" != "8" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" -a "${XC_VERSION_PARTS[[0]]}" != "13" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([Xcode 6-13 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Some versions of Xcode command line tools install gcc and g++ as symlinks to
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>