<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/c2e76a1edad1b0950aa200eb9e1e8e04d06f531c">https://github.com/macports/macports-ports/commit/c2e76a1edad1b0950aa200eb9e1e8e04d06f531c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c2e76a1edad1b0950aa200eb9e1e8e04d06f531c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 15 22:42:10 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> openjdk8: add openjdk8-bootstrap dep for arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was forgotten in 674c6c4.
</span>---
java/openjdk8/Portfile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
<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 493140ff389..6e04f55f627 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;'>@@ -75,8 +75,7 @@ configure.cmd ${prefix}/bin/bash ./configure
</span> configure.pre_args --prefix=${tpath}
set bug_url "https://trac.macports.org/newticket?port=${name}"
# default configure args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-boot-jdk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-debug-level=release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-debug-level=release \
</span> --with-freetype-include=${prefix}/include/freetype2 \
--with-freetype-lib=${prefix}/lib \
--with-target-bits=${datamodel} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +122,7 @@ post-patch {
</span>
if {${configure.build_arch} eq "ppc"} {
depends_build-append port:openjdk7-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-boot-jdk --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk7-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk7-bootstrap
</span> configure.post_args --disable-headful
post-patch {
reinplace "s|WARNINGS_ARE_ERRORS = -Werror|WARNING_FLAGS =|g" hotspot/make/bsd/makefiles/gcc.make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +132,7 @@ if {${configure.build_arch} eq "ppc"} {
</span> reinplace "s|dtraceCheck| |g" hotspot/make/bsd/makefiles/vm.make
reinplace "s|LP64=1|LP64=0|g" hotspot/make/bsd/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${configure.build_arch} eq "x86_64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${configure.build_arch} in "arm64 x86_64"} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
# NOTE: openjdk8-bootstrap's doesn't work enough to bootstrap openjdk on 10.6
# It is fails with errors like:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +148,7 @@ if {${configure.build_arch} eq "ppc"} {
</span> }
depends_build-append port:openjdk8-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-boot-jdk --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk8-bootstrap/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk8-bootstrap/Contents/Home
</span> }
variant server \
</pre><pre style='margin:0'>
</pre>