pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openjdk25: adjust some PLIST conditionals
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Wed Sep 16 19:06:20 2026 +0200
Changeset: a133bb1df1342d1ca9011bf0591c6b9e53159f78
Modified Files:
openjdk25/Makefile
openjdk25/PLIST
openjdk25/PLIST.Darwin
openjdk25/options.mk
Log Message:
openjdk25: adjust some PLIST conditionals
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a133bb1df1342d1ca9011bf0591c6b9e53159f78
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openjdk25/Makefile | 5 +++++
openjdk25/PLIST | 8 ++++----
openjdk25/PLIST.Darwin | 2 --
openjdk25/options.mk | 4 +++-
4 files changed, 12 insertions(+), 7 deletions(-)
diffs:
diff --git a/openjdk25/Makefile b/openjdk25/Makefile
index 1f69fcefaa..cf05f95895 100644
--- a/openjdk25/Makefile
+++ b/openjdk25/Makefile
@@ -163,6 +163,11 @@ PLIST_VARS+= bsd-fontconfig
PLIST.bsd-fontconfig= yes
.endif
+PLIST_VARS+= awt-headless
+.if ${OPSYS} != "Darwin"
+PLIST.awt-headless= yes
+.endif
+
post-extract:
# These libs are bundled w/ the netbsd-9 bootstrap to facilitate building with
# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
diff --git a/openjdk25/PLIST b/openjdk25/PLIST
index de016fac50..4132cdeb4b 100644
--- a/openjdk25/PLIST
+++ b/openjdk25/PLIST
@@ -513,8 +513,8 @@ java/openjdk25/lib/libattach${DBGEXT}
java/openjdk25/lib/libattach.so
java/openjdk25/lib/libawt${DBGEXT}
java/openjdk25/lib/libawt.so
-java/openjdk25/lib/libawt_headless${DBGEXT}
-java/openjdk25/lib/libawt_headless.so
+${PLIST.awt-headless}java/openjdk25/lib/libawt_headless${DBGEXT}
+${PLIST.awt-headless}java/openjdk25/lib/libawt_headless.so
${PLIST.x11}java/openjdk25/lib/libawt_xawt${DBGEXT}
${PLIST.x11}java/openjdk25/lib/libawt_xawt.so
java/openjdk25/lib/libdt_socket${DBGEXT}
@@ -569,8 +569,8 @@ java/openjdk25/lib/libprefs${DBGEXT}
java/openjdk25/lib/libprefs.so
java/openjdk25/lib/librmi${DBGEXT}
java/openjdk25/lib/librmi.so
-${PLIST.x11}java/openjdk25/lib/libsplashscreen${DBGEXT}
-${PLIST.x11}java/openjdk25/lib/libsplashscreen.so
+${PLIST.splashscreen}java/openjdk25/lib/libsplashscreen${DBGEXT}
+${PLIST.splashscreen}java/openjdk25/lib/libsplashscreen.so
java/openjdk25/lib/libsyslookup${DBGEXT}
java/openjdk25/lib/libsyslookup.so
java/openjdk25/lib/libverify${DBGEXT}
diff --git a/openjdk25/PLIST.Darwin b/openjdk25/PLIST.Darwin
index bccbc7bd38..aad411af50 100644
--- a/openjdk25/PLIST.Darwin
+++ b/openjdk25/PLIST.Darwin
@@ -30,6 +30,4 @@ java/openjdk25/lib/libsaproc${DBGEXT}
java/openjdk25/lib/libsaproc.dylib
java/openjdk25/lib/libsleef${DBGEXT}
java/openjdk25/lib/libsleef.dylib
-java/openjdk25/lib/libsplashscreen${DBGEXT}
-java/openjdk25/lib/libsplashscreen.dylib
java/openjdk25/lib/shaders.metallib
diff --git a/openjdk25/options.mk b/openjdk25/options.mk
index 982b11509f..d845212d27 100644
--- a/openjdk25/options.mk
+++ b/openjdk25/options.mk
@@ -35,8 +35,9 @@ CONFIGURE_ARGS+= --disable-unlimited-crypto
###
### X11 or headless build
###
-PLIST_VARS+= x11
+PLIST_VARS+= splashscreen x11
.if !empty(PKG_OPTIONS:Mx11)
+PLIST.splashscreen= yes
PLIST.x11= yes
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
@@ -53,6 +54,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXtst/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.elif ${OPSYS} == "Darwin"
+PLIST.splashscreen= yes
# The Metal compiler is no longer part of Xcode itself.
# You need to manually run `sudo xcodebuild -downloadComponent MetalToolchain`
CONFIGURE_ARGS+= METAL="xcrun metal"
Home |
Main Index |
Thread Index |
Old Index