<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/924cfc84eab34d91cb7411ef3d532cfb74765f15">https://github.com/macports/macports-ports/commit/924cfc84eab34d91cb7411ef3d532cfb74765f15</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 924cfc84eab34d91cb7411ef3d532cfb74765f15
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sat Apr 23 16:01:44 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk11: fix builds
</span>---
java/openjdk11/Portfile | 18 ++++--------------
1 file changed, 4 insertions(+), 14 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 6d2f7bfbfed..e9e0510f532 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;'>@@ -7,7 +7,7 @@ name openjdk11
</span> # remove 'jdk-' from the latest tag without '-ga' that has commit that corresponds to the latest tag with '-ga'
version 11.0.15+10
set ver [string map {+10 {}} ${version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories java devel
platforms darwin
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +32,6 @@ pre-patch {
</span> reinplace "s|assert|vmassert|g" ${worksrcpath}/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.cpp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:openjdk11-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:openjdk11-zulu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.major} < 16} {
default_variants +zero +release
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +42,6 @@ set tpath /Library/Java
</span> use_configure yes
configure.cmd ${prefix}/bin/bash configure
configure.pre_args --prefix=${tpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set extrachflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set extracxxflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set extraldflags "-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span> set bug_url "https://trac.macports.org/newticket?port=${name}"
# default configure args
configure.args --with-debug-level=release \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +49,9 @@ configure.args --with-debug-level=release \
</span> --with-version-string=${version} \
--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}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-cxxflags="${configure.cxxflags} ${extracxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-ldflags="${configure.ldflags} ${extraldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cflags="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags}" \
</span> --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk11-bootstrap/Contents/Home \
--disable-warnings-as-errors \
--disable-precompiled-headers \
</pre><pre style='margin:0'>
</pre>