<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/ee9e62a3a20b6931a682f70e5851aaa8f840ba78">https://github.com/macports/macports-ports/commit/ee9e62a3a20b6931a682f70e5851aaa8f840ba78</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 ee9e62a3a20 openjdk13: update to 13.0.11+4
</span>ee9e62a3a20 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ee9e62a3a20b6931a682f70e5851aaa8f840ba78
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sun Apr 24 15:46:11 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk13: update to 13.0.11+4
</span>---
java/openjdk13/Portfile | 69 +++++++++++++++++++++++++++++++------------------
1 file changed, 44 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk13/Portfile b/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f716b649c8..45881492b05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,10 @@ PortSystem 1.0
</span>
name openjdk13
# https://github.com/openjdk/jdk13u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 13.0.10
</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 13.0.11+4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver [string map {+4 {}} ${version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories java devel
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,26 +17,28 @@ description Openjdk 13
</span> long_description JDK 13 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/jdk13u
</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/jdk13u/archive/refs/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname jdk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a3ed0636becbf434ae79232d75a466bd2a0e9085 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 acaaa1b86c6905926634e1a85d834aae703fa27b81a62622419e0553786339fc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 109265999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:autoconf \
port:gmake \
port:bash \
port:openjdk13-bootstrap
<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
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><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 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +47,9 @@ configure.args --with-debug-level=release \
</span> --with-jvm-variants=server \
--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}" \
</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/openjdk13-bootstrap/Contents/Home \
--disable-warnings-as-errors \
--disable-precompiled-headers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,45 +59,60 @@ configure.args --with-debug-level=release \
</span> --with-vendor-vm-bug-url="${bug_url}" \
--without-version-opt \
--without-version-pre \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-conf-name=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-conf-name=openjdk13
</span>
variant server \
<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;'>+ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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> }
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 \
conflicts server client minimal \
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;'>+ 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> }
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/openjdk13/images/jdk-bundle/${jdkn}/Contents
</span>
test.run yes
test.cmd ${bundle_dir}/Home/bin/java
</pre><pre style='margin:0'>
</pre>