<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5ae476fb31d76cfdc830b6bcf72664b60b01a217">https://github.com/macports/macports-ports/commit/5ae476fb31d76cfdc830b6bcf72664b60b01a217</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 5ae476fb31d openjdk*-bootstrap: platforms fixes
</span>5ae476fb31d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5ae476fb31d76cfdc830b6bcf72664b60b01a217
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Aug 9 09:25:13 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> openjdk*-bootstrap: platforms fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify platforms darwin any, since the same files are installed
</span><span style='display:block; white-space:pre;color:#404040;'> regardless of OS version. Ensure master_sites is set since it is a
</span><span style='display:block; white-space:pre;color:#404040;'> required variable and its absence causes confusing errors. Clear
</span><span style='display:block; white-space:pre;color:#404040;'> distfiles for unsupported archs.
</span>---
java/openjdk13-bootstrap/Portfile | 4 ++--
java/openjdk15-bootstrap/Portfile | 4 ++--
java/openjdk17-bootstrap/Portfile | 6 ++++--
java/openjdk18-bootstrap/Portfile | 6 ++++--
java/openjdk19-bootstrap/Portfile | 5 ++++-
java/openjdk20-bootstrap/Portfile | 6 ++++--
java/openjdk7-bootstrap/Portfile | 2 +-
java/openjdk8-bootstrap/Portfile | 9 ++++++---
8 files changed, 27 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk13-bootstrap/Portfile b/java/openjdk13-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 675704946cb..9ace1d8139f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk13-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk13-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk13-bootstrap
</span> version 13
set build 33
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,4 +33,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk15-bootstrap/Portfile b/java/openjdk15-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a3478ab64e..fe3b520e844 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk15-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk15-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk15-bootstrap
</span> version 15
set build 36
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,4 +33,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk17-bootstrap/Portfile b/java/openjdk17-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d953e872fab..8f77aea5e01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk17-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk17-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk17-bootstrap
</span> version 17
set build 35
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,8 @@ if {${configure.build_arch} eq "x86_64"} {
</span> sha256 b5bf6377aabdc935bd72b36c494e178b12186b0e1f4be50f35134daa33bda052 \
size 181735146
distname openjdk-${version}_macos-aarch64_bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span> }
use_xcode no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,4 +42,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18-bootstrap/Portfile b/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4292d8a8810..6bd80593f19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk18-bootstrap
</span> version 18
set build 36
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,8 @@ if {${configure.build_arch} eq "x86_64"} {
</span> sha256 6880a5b512d1c1df5013a04b2cef4e1261e881d7f246ea5483ffeb728b30b2f1 \
size 183221810
distname openjdk-${version}_macos-aarch64_bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span> }
use_xcode no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,4 +42,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk19-bootstrap/Portfile b/java/openjdk19-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ddc0e3468f..8d182b7729a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk19-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk19-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk19-bootstrap
</span> version 19
set build 36
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,8 @@ if {${configure.build_arch} eq "x86_64"} {
</span> sha256 6691c199fdc6d71826f37d89d2e1a2089ba8bdd98b7001c1d4e8d5d01d6b022b \
size 190416515
distname openjdk-${version}_macos-aarch64_bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span> }
use_xcode no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk20-bootstrap/Portfile b/java/openjdk20-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ad097b73247..e067647c240 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk20-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk20-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ name openjdk20-bootstrap
</span> version 20
set build 36
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,8 @@ if {${configure.build_arch} eq "x86_64"} {
</span> sha256 d020f5c512c043cfb7119a591bc7e599a5bfd76d866d939f5562891d9db7c9b3 \
size 191881541
distname openjdk-${version}_macos-aarch64_bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span> }
use_xcode no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,4 +42,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk7-bootstrap/Portfile b/java/openjdk7-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c682d3b350e..4ccb7b9afee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk7-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk7-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ name openjdk7-bootstrap
</span> version 1.7.0_2
set build 2012-03-14
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs ppc
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-bootstrap/Portfile b/java/openjdk8-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2bb4bda0478..64247aec7fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,8 @@ name openjdk8-bootstrap
</span> version 8
revision 0
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: specify which darwin versions the binary actually works on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs x86_64
license Restrictive/Distributable
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +54,9 @@ if {${configure.build_arch} eq "x86_64"} {
</span> configure.cxx_stdlib libstdc++
worksrcdir ${distname}/zulu-8.jdk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +65,7 @@ build {}
</span>
if {${configure.build_arch} eq "x86_64"} {
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts report `Contents/Home/jre/lib/libdeploy.dylib` as broken file during `port rev update`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts report `Contents/Home/jre/lib/libdeploy.dylib` as broken file during `port rev-upgrade`
</span> # see https://trac.macports.org/ticket/65049
delete ${worksrcpath}/Contents/Home/jre/lib/libdeploy.dylib
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,4 +77,3 @@ destroot {
</span> copy ${worksrcpath}/Contents ${destroot}${path}
}
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>