CVS commit: pkgsrc/lang/openjdk8

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Nov 12 10:42:07 UTC 2018

Modified Files:
        pkgsrc/lang/openjdk8: Makefile bootstrap.mk
Added Files:
        pkgsrc/lang/openjdk8: PLIST.Linux

Log Message:
openjdk8: some Linux packaging fixes


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/openjdk8/PLIST.Linux
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/openjdk8/bootstrap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.72 pkgsrc/lang/openjdk8/Makefile:1.73
--- pkgsrc/lang/openjdk8/Makefile:1.72  Mon Nov 12 03:52:26 2018
+++ pkgsrc/lang/openjdk8/Makefile       Mon Nov 12 10:42:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2018/11/12 03:52:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2018/11/12 10:42:07 tnn Exp $
 
 DISTNAME=      openjdk-1.8.181-20180914
 PKGNAME=       openjdk8-1.8.181
@@ -77,7 +77,7 @@ NOT_PAX_MPROTECT_SAFE+= java/openjdk8/jr
 MAKE_ENV+=     JAVA_HOME=
 MAKE_ENV+=     CLASSPATH=
 
-BUILD_OPSYS=   ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}
+BUILD_OPSYS=   ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
 BUILD_ARCH=    ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
 LIBDIR_ARCH=   ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
 BUILDDIR=      ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
@@ -171,7 +171,7 @@ PLIST.i386= yes
 .endif
 
 PLIST_VARS+=   sctp
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
 PLIST.sctp=    yes
 .endif
 
@@ -266,7 +266,9 @@ MAKE_ENV+=  STRIP=${PREFIX}/bin/gstrip
 .endif
 
 # disabled the ALSA support for now on BSDs via patch
-#.include "../../audio/alsa-lib/buildlink3.mk"
+.if ${OPSYS} == "Linux"
+.include "../../audio/alsa-lib/buildlink3.mk"
+.endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/lang/openjdk8/bootstrap.mk
diff -u pkgsrc/lang/openjdk8/bootstrap.mk:1.12 pkgsrc/lang/openjdk8/bootstrap.mk:1.13
--- pkgsrc/lang/openjdk8/bootstrap.mk:1.12      Mon Sep 17 10:50:26 2018
+++ pkgsrc/lang/openjdk8/bootstrap.mk   Mon Nov 12 10:42:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.12 2018/09/17 10:50:26 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.13 2018/11/12 10:42:07 tnn Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -27,6 +27,7 @@ ONLY_FOR_PLATFORM=    NetBSD-[5-9].*-i386 N
 ONLY_FOR_PLATFORM+=    NetBSD-[7-9].*-sparc64 NetBSD-[7-9].*-earmv[67]hf
 ONLY_FOR_PLATFORM+=    NetBSD-*-aarch64
 ONLY_FOR_PLATFORM+=    DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
+ONLY_FOR_PLATFORM+=    Linux-*-x86_64
 
 BOOT.nb5-i386=         bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
 BOOT.nb5-amd64=                bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz
@@ -103,6 +104,10 @@ DISTFILES+=                ${BOOT.fbsd10-amd64}
 EXTRACT_ONLY+=         ${BOOT.fbsd10-amd64}
 .endif
 
+.if ${OPSYS} == "Linux"
+# TODO adoptopenjdk?
+.endif
+
 .if ${OPSYS} == "SunOS"
 BUILDLINK_DEPMETHOD.sun-jdk7?= build
 .include "../../lang/sun-jdk7/buildlink3.mk"

Added files:

Index: pkgsrc/lang/openjdk8/PLIST.Linux
diff -u /dev/null pkgsrc/lang/openjdk8/PLIST.Linux:1.1
--- /dev/null   Mon Nov 12 10:42:07 2018
+++ pkgsrc/lang/openjdk8/PLIST.Linux    Mon Nov 12 10:42:07 2018
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2018/11/12 10:42:07 tnn Exp $
+java/openjdk8/jre/lib/${ARCH}/libjsoundalsa.so