<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/bd2aeabf7e90e02c900eef25a7d7971e7daeb740">https://github.com/macports/macports-ports/commit/bd2aeabf7e90e02c900eef25a7d7971e7daeb740</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd2aeabf7e90e02c900eef25a7d7971e7daeb740
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Thu Apr 21 16:24:18 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk11: update to 11.0.15+10
</span>---
java/openjdk11/Portfile | 89 +++++++++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 39 deletions(-)
<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 fbcd7203149..b85f655bca4 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;'>@@ -4,8 +4,10 @@ PortSystem 1.0
</span>
name openjdk11
# https://github.com/openjdk/jdk11u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 11.0.14.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove 'jdk-' from the latest tag without '-ga' that has commit that corresponds to the latest tag with '-ga'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 11.0.15+10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver [string map {+10 {}} ${version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories java devel
platforms darwin
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,19 +17,17 @@ description Openjdk 11
</span> long_description JDK 11 builds of Openjdk, the Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
homepage https://openjdk.java.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url https://github.com/openjdk/jdk11u
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch jdk-${version}-ga
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://git.openjdk.java.net/jdk11u/archive/refs/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname jdk-11.0.15+10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4e54be9b3a7ee2a0c7d8c5596f6b95396d30bb25 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a125f0f2e34061ea1509c9f24caec51e6e23411552d6b660a6f60c054853dc63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 122892672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:autoconf \
port:gmake \
port:bash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-openjdk11-build1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openjdk11-arm64-fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openjdk11-arm64.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openjdk11-arm64-fix2.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openjdk11-arm64-fix3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-patch {
reinplace "s|assert|vmassert|g" ${worksrcpath}/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.cpp
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,11 @@ if {${configure.build_arch} eq "x86_64"} {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +server +release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +zero +release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +server +release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set tpath /Library/Java
use_configure yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,20 +52,16 @@ configure.pre_args --prefix=${tpath}
</span> set extrachflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
set extracxxflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
set extraldflags "-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jchflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set jcxxflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set jldflags "-L`xcrun --sdk macosx --show-sdk-path`/usr/lib -L`xcrun --sdk macosx --show-sdk-path`/usr/lib/system"
</span> set bug_url "https://trac.macports.org/newticket?port=${name}"
# default configure args
configure.args --with-debug-level=release \
--with-native-debug-symbols=none \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-version-pre=release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jvm-variants=server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-version-string=${version} \
</span> --with-target-bits=64 \
--with-sysroot=`xcrun --sdk macosx --show-sdk-path` \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-cflags="${configure.cflags} ${extrachflags} ${jchflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-cxxflags="${configure.cxxflags} ${extracxxflags} ${jcxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-ldflags="${configure.ldflags} ${extraldflags} ${jldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cflags="${configure.cflags} ${extrachflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags} ${extracxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags} ${extraldflags}" \
</span> --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk11-bootstrap/Contents/Home \
--disable-warnings-as-errors \
--disable-precompiled-headers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,57 +69,68 @@ configure.args --with-debug-level=release \
</span> --with-vendor-url="${homepage}" \
--with-vendor-bug-url="${bug_url}" \
--with-vendor-vm-bug-url="${bug_url}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-version-opt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-version-pre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-conf-name=release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {JVM with normal interpreter, and a tiered C1/C2 compiler} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-conf-name=openjdk11
</span>
variant release \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description {OpenJDK with no debug information, all optimizations and no asserts} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {OpenJDK with no debug information, all optimizations and no asserts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-debug-level=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant optimized \
description {OpenJDK with no debug information, all optimizations, no asserts and HotSpot is 'optimized'} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-debug-level=release --with-debug-level=optimized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-debug-level=optimized
</span> }
variant debug \
description {OpenJDK with debug information, all optimizations and all asserts} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-debug-level=release --with-debug-level=fastdebug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-debug-level=fastdebug
</span> configure.args-delete --with-native-debug-symbols=none
}
variant client \
description {JVM with normal interpreter, C1 and no C2 compiler} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-jvm-variants=server --with-jvm-variants=client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with normal interpreter, and a tiered C1/C2 compiler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=server
</span> }
variant minimal \
description {JVM with reduced form of normal interpreter having C1, no C2 compiler and optional features stripped out} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-jvm-variants=server --with-jvm-variants=minimal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=minimal
</span> }
variant core \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts server client minimal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts server client minimal zero \
</span> description {JVM with normal interpreter only and no compiler} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-jvm-variants=server --with-jvm-variants=core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant zero \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts server client minimal core \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {JVM with C++ based interpreter only, no compiler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|libffi.so.?|libffi.?.dylib|g" ${worksrcpath}/make/autoconf/lib-ffi.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jvm-variants=zero \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libffi=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libffi-bundling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libffi
</span> }
if {${configure.build_arch} eq "arm64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk11-bootstrap/Contents/Home \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk11-zulu/Contents/Home
</span> configure.args-delete --with-target-bits=64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args --with-build-jdk=/Library/Java/JavaVirtualMachines/openjdk11-zulu/Contents/Home \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --openjdk-target=aarch64-apple-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args --openjdk-target=aarch64-apple-darwin
</span> } elseif {${configure.build_arch} eq "x86_64"} {
configure.post_args
}
build.type gnu
build.target images
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jdkn jdk-${version}.jdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set bundle_dir build/release/images/jdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdkn jdk-${ver}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bundle_dir build/openjdk11/images/jdk-bundle/${jdkn}/Contents
</span>
test.run yes
test.cmd ${bundle_dir}/Home/bin/java
</pre><pre style='margin:0'>
</pre>