<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/c789c33128f4a762fec56825400a773e3833083f">https://github.com/macports/macports-ports/commit/c789c33128f4a762fec56825400a773e3833083f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c789c33128f4a762fec56825400a773e3833083f
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sat Apr 9 21:14:25 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk8: make build more specific
</span>---
java/openjdk8/Portfile | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 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 4c2fee96fbf..6a3aa585285 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;'>@@ -8,7 +8,7 @@ name openjdk8
</span> # https://github.com/openjdk/jdk8u/tags
set u 322
version 1.8.0_${u}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories java devel
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,6 @@ depends_build port:autoconf \
</span> port:bash \
port:openjdk8-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove pre-patch phase after jdk8u341-ga tag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|JDK_UPDATE_VERSION=|JDK_UPDATE_VERSION=${u}|g" ${worksrcpath}/common/autoconf/version-numbers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default_variants +server +release
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +36,29 @@ use_xcode yes
</span> use_configure yes
configure.cmd ${prefix}/bin/bash ./configure
configure.pre_args --prefix=${tpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set extrachflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set extracxxflags "-isysroot `xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set extraldflags "-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jchflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jcxxflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jldflags "-L`xcrun --sdk macosx --show-sdk-path`/usr/lib -L`xcrun --sdk macosx --show-sdk-path`/usr/lib/system"
</span><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-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk8-bootstrap/Contents/Home \
--with-debug-level=release \
--with-freetype-include=${prefix}/include/freetype2 \
--with-freetype-lib=${prefix}/lib \
--with-jvm-variants=server \
<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-extra-cflags="${configure.cflags} ${extrachflags} ${jchflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-cxxflags="${configure.cxxflags} ${extracxxflags} ${jcxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-ldflags="${configure.ldflags} ${extraldflags} ${jldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-milestone=fcs \
</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;'>+ --with-update-version=${u} \
</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;'>@@ -73,8 +84,8 @@ use_parallel_build no
</span> worksrcdir openjdk8
set jdkn jdk${version}.jdk
set jren jre${version}.jre
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jdk_bundle_dir build/openjdk${version}/images/j2sdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set jre_bundle_dir build/openjdk${version}/images/j2re-bundle/${jren}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdk_bundle_dir build/release/images/j2sdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jre_bundle_dir build/release/images/j2re-bundle/${jren}/Contents
</span> set jdk_path ${tpath}/JavaVirtualMachines/${name}
set jre_path ${tpath}/JavaVirtualMachines/${name}-jre
</pre><pre style='margin:0'>
</pre>