<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e7f39725b6d7987fd4b9619600b00e129fcb549">https://github.com/macports/macports-ports/commit/7e7f39725b6d7987fd4b9619600b00e129fcb549</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7e7f39725b6 openjdk*: fix build with ccache
</span>7e7f39725b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e7f39725b6d7987fd4b9619600b00e129fcb549
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Dec 10 08:49:44 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> openjdk*: fix build with ccache
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68022
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
java/openjdk11/Portfile | 8 ++++++++
java/openjdk13/Portfile | 8 ++++++++
java/openjdk15/Portfile | 7 +++++++
java/openjdk17/Portfile | 7 +++++++
java/openjdk18/Portfile | 7 +++++++
java/openjdk19/Portfile | 7 +++++++
java/openjdk20/Portfile | 7 +++++++
java/openjdk21/Portfile | 8 ++++++++
java/openjdk8/Portfile | 8 ++++++++
9 files changed, 67 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk11/Portfile b/java/openjdk11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30a0f3bece5..c980010f82b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,14 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=openjdk11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant release \
conflicts debug optimized \
description {OpenJDK with no debug information, all optimizations and no asserts} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk13/Portfile b/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b50fca0cbd..3ac995f07db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,14 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=openjdk13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant server \
conflicts client core minimal zero \
description {JVM with normal interpreter, and a tiered C1/C2 compiler} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk15/Portfile b/java/openjdk15/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f70683c8dc..19147ed4817 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,13 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant release \
conflicts debug optimized \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk17/Portfile b/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c26aaa36a39..9748c07f6f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,13 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant release \
conflicts debug optimized \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18/Portfile b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39e4f53f486..f9ea4b5c2c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,13 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant release \
conflicts debug optimized \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk19/Portfile b/java/openjdk19/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8b7f335ced..c79005cfe63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,13 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant release \
conflicts debug optimized \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk20/Portfile b/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84921f69370..f2091996345 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,13 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant release \
conflicts debug optimized \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/Portfile b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 368a476b0fb..6ee2a655318 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,14 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--with-conf-name=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant release \
conflicts debug optimized \
description {OpenJDK with no debug information, all optimizations and no asserts} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/Portfile b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0796ba2a3f..202208ad973 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +81,14 @@ configure.args --with-boot-jdk \
</span> --with-conf-name=openjdk8 \
--with-native-debug-symbols=none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace MacPorts ccache integration into JDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/ccache:ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ccache-dir=${ccache_dir}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { [string match *clang* ${configure.compiler}] } {
configure.args-append \
--with-toolchain-type=clang
</pre><pre style='margin:0'>
</pre>