pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openjdk25: fix some PLIST issues on Darwin
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Wed Sep 16 18:28:35 2026 +0200
Changeset: 5bf687804f60e83689609318dbe8c120c76a7811
Modified Files:
openjdk25/Makefile
openjdk25/PLIST
Added Files:
openjdk25/PLIST.Darwin
Log Message:
openjdk25: fix some PLIST issues on Darwin
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5bf687804f60e83689609318dbe8c120c76a7811
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openjdk25/Makefile | 6 ++++--
openjdk25/PLIST | 2 +-
openjdk25/PLIST.Darwin | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 3 deletions(-)
diffs:
diff --git a/openjdk25/Makefile b/openjdk25/Makefile
index bb862f548b..1f69fcefaa 100644
--- a/openjdk25/Makefile
+++ b/openjdk25/Makefile
@@ -96,11 +96,12 @@ BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/li
BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/server
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/${BUILD_VARIANT}
WRKSRC= ${WRKDIR}/${DISTNAME}
.include "../../mk/compiler.mk"
+PLIST_VARS+= gcc
.if !empty(PKGSRC_COMPILER:Mclang)
CONFIGURE_ARGS+= --with-toolchain-type=clang
_WRAP_EXTRA_ARGS.CC+= -Wno-format-nonliteral -Wno-sign-compare -Wno-char-subscripts
@@ -116,6 +117,7 @@ CWRAPPERS_APPEND.cxx+= -mstackrealign
. endif
.else
# GCC
+PLIST.gcc= yes
CONFIGURE_ARGS+= --with-toolchain-type=gcc
CWRAPPERS_APPEND.cxx+= -Wno-attributes
.endif
@@ -157,7 +159,7 @@ TOOLS_PLATFORM.unzip=
.endif
PLIST_VARS+= bsd-fontconfig
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
PLIST.bsd-fontconfig= yes
.endif
diff --git a/openjdk25/PLIST b/openjdk25/PLIST
index 8867144c76..de016fac50 100644
--- a/openjdk25/PLIST
+++ b/openjdk25/PLIST
@@ -259,7 +259,7 @@ java/openjdk25/legal/java.base/LICENSE
java/openjdk25/legal/java.base/aes.md
java/openjdk25/legal/java.base/c-libutl.md
java/openjdk25/legal/java.base/cldr.md
-java/openjdk25/legal/java.base/gcc.md
+${PLIST.gcc}java/openjdk25/legal/java.base/gcc.md
java/openjdk25/legal/java.base/icu.md
java/openjdk25/legal/java.base/public_suffix.md
java/openjdk25/legal/java.base/siphash.md
diff --git a/openjdk25/PLIST.Darwin b/openjdk25/PLIST.Darwin
new file mode 100644
index 0000000000..bccbc7bd38
--- /dev/null
+++ b/openjdk25/PLIST.Darwin
@@ -0,0 +1,35 @@
+@comment $NetBSD$
+java/openjdk25/bin/jhsdb
+java/openjdk25/bin/jhsdb${DBGEXT}
+java/openjdk25/bin/jpackage
+java/openjdk25/bin/jpackage${DBGEXT}
+java/openjdk25/jmods/jdk.hotspot.agent.jmod
+java/openjdk25/jmods/jdk.jpackage.jmod
+java/openjdk25/legal/java.desktop/freetype.md
+java/openjdk25/legal/jdk.hotspot.agent/ADDITIONAL_LICENSE_INFO
+java/openjdk25/legal/jdk.hotspot.agent/ASSEMBLY_EXCEPTION
+java/openjdk25/legal/jdk.hotspot.agent/LICENSE
+java/openjdk25/legal/jdk.jpackage/ADDITIONAL_LICENSE_INFO
+java/openjdk25/legal/jdk.jpackage/ASSEMBLY_EXCEPTION
+java/openjdk25/legal/jdk.jpackage/LICENSE
+java/openjdk25/lib/libawt_lwawt${DBGEXT}
+java/openjdk25/lib/libawt_lwawt.dylib
+java/openjdk25/lib/libfreetype${DBGEXT}
+java/openjdk25/lib/libfreetype.dylib
+java/openjdk25/lib/libosx${DBGEXT}
+java/openjdk25/lib/libosx.dylib
+java/openjdk25/lib/libosxapp${DBGEXT}
+java/openjdk25/lib/libosxapp.dylib
+java/openjdk25/lib/libosxkrb5${DBGEXT}
+java/openjdk25/lib/libosxkrb5.dylib
+java/openjdk25/lib/libosxsecurity${DBGEXT}
+java/openjdk25/lib/libosxsecurity.dylib
+java/openjdk25/lib/libosxui${DBGEXT}
+java/openjdk25/lib/libosxui.dylib
+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
Home |
Main Index |
Thread Index |
Old Index