<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/2e53cce8f2c55ef9cdd4397af889b1aba3c656cb">https://github.com/macports/macports-ports/commit/2e53cce8f2c55ef9cdd4397af889b1aba3c656cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e53cce8f2c55ef9cdd4397af889b1aba3c656cb
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sat Apr 9 21:16:58 2022 +0530

<span style='display:block; white-space:pre;color:#404040;'>    openjdk11: make build more specific
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/64902
</span>---
 java/openjdk11/Portfile | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 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 0b4b698ccdd..16ed36b4823 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;'>@@ -5,7 +5,7 @@ PortSystem          1.0
</span> name                openjdk11
 # https://github.com/openjdk/jdk11u/tags
 version             11.0.14.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            4
</span> categories          java devel
 platforms           darwin
 supported_archs     x86_64 arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,21 +20,22 @@ git.url             https://github.com/openjdk/jdk11u
</span> git.branch             jdk-${version}-ga
 depends_build       port:autoconf \
                     port:gmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:bash \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:openjdk11-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-openjdk11-build1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openjdk11-arm64-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openjdk11-arm64.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openjdk11-arm64-fix2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openjdk11-arm64-fix3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|assert|vmassert|g" ${worksrcpath}/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 if {${configure.build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          patch-openjdk11-build2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append       port:openjdk11-bootstrap
</span> } elseif {${configure.build_arch} eq "arm64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-replace       port:openjdk11-bootstrap port:openjdk11-zulu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          patch-openjdk11-build2.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;'>-    if {${os.major} == 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append          patch-openjdk11-build1.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append       port:openjdk11-zulu
</span>     use_xcode           yes
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,11 +51,13 @@ set extraldflags "-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -arch ${c
</span> set jchflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
 set jcxxflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
 set jldflags "-L`xcrun --sdk macosx --show-sdk-path`/usr/lib -L`xcrun --sdk macosx --show-sdk-path`/usr/lib/system"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set bug_url "https://trac.macports.org/newticket?port=${name}"
</span> # default configure args
 configure.args      --with-debug-level=release \
                     --with-native-debug-symbols=none \
                     --with-version-pre=release \
                     --with-jvm-variants=server \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-target-bits=64 \
</span>                     --with-sysroot=`xcrun --sdk macosx --show-sdk-path` \
                     --with-extra-cflags="${configure.cflags} ${extrachflags} ${jchflags}" \
                     --with-extra-cxxflags="${configure.cxxflags} ${extracxxflags} ${jcxxflags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +65,13 @@ configure.args      --with-debug-level=release \
</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:#ffe0e0;'>-                    --with-conf-name=openjdk${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-vendor-name="OpenJDK Porters Group" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-vendor-url="${homepage}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-vendor-bug-url="${bug_url}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-vendor-vm-bug-url="${bug_url}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --without-version-opt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --without-version-pre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-conf-name=release
</span> 
 variant server \
     description {JVM with normal interpreter, and a tiered C1/C2 compiler} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +118,7 @@ build.type          gnu
</span> build.target        images
 use_parallel_build  no
 set jdkn jdk-${version}.jdk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set bundle_dir build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bundle_dir build/release/images/jdk-bundle/${jdkn}/Contents
</span> 
 test.run            yes
 test.cmd            ${bundle_dir}/Home/bin/java
</pre><pre style='margin:0'>

</pre>