Mon Oct 14 07:58:50 2019 UTC ()
openjdk11: don't leak WRKDIR references. Bump.

Apparently it's unsafe to have LD_LIBRARY_PATH in PKGSRC_MAKE_ENV because
it somehow gets passed to pkg_create(8) which then messes up REQUIRES lines
in +BUILD_INFO. Reported to pkgsrc-users@ by Mike Pumford.


(tnn)
diff -r1.2 -r1.3 pkgsrc/lang/openjdk11/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/openjdk11/bootstrap.mk
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2019/10/01 14:39:07 1.2
+++ pkgsrc/lang/openjdk11/Makefile 2019/10/14 07:58:50 1.3
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2019/10/01 14:39:07 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2019/10/14 07:58:50 tnn Exp $
2 2
3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
7GITHUB_PROJECT= openjdk-jdk11u 7GITHUB_PROJECT= openjdk-jdk11u
8GITHUB_TAG= jdk-11.0.5+8-1 8GITHUB_TAG= jdk-11.0.5+8-1
 9PKGREVISION= 1
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 12HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 13COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 18
18JAVA_NAME= openjdk11 19JAVA_NAME= openjdk11
19JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 20JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
20JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \ 21JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \
21 keytool orbd policytool rmid rmiregistry servertool tnameserv 22 keytool orbd policytool rmid rmiregistry servertool tnameserv
@@ -143,27 +144,27 @@ ${WRKDIR}/cacerts.out: @@ -143,27 +144,27 @@ ${WRKDIR}/cacerts.out:
143 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C \ 144 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C \
144 ${ALT_BOOTDIR}/bin/keytool \ 145 ${ALT_BOOTDIR}/bin/keytool \
145 -noprompt \ 146 -noprompt \
146 -importcert \ 147 -importcert \
147 -keystore ${.TARGET}.tmp \ 148 -keystore ${.TARGET}.tmp \
148 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ 149 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \
149 -file $$cert \ 150 -file $$cert \
150 -storepass changeit; \ 151 -storepass changeit; \
151 done 152 done
152 mv ${.TARGET}.tmp ${.TARGET} 153 mv ${.TARGET}.tmp ${.TARGET}
153 154
154do-build: 155do-build:
155 rm -f ${WRKSRC}/make/data/fontconfig/*.orig 156 rm -f ${WRKSRC}/make/data/fontconfig/*.orig
156 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 157 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
157 158
158do-install: 159do-install:
159 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 160 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
160 cd ${BUILDDIR}/images/jdk && pax -rwpp . \ 161 cd ${BUILDDIR}/images/jdk && pax -rwpp . \
161 ${DESTDIR}${JAVA_HOME}/. 162 ${DESTDIR}${JAVA_HOME}/.
162 163
163.if ${OPSYS} == "Linux" 164.if ${OPSYS} == "Linux"
164.include "../../audio/alsa-lib/buildlink3.mk" 165.include "../../audio/alsa-lib/buildlink3.mk"
165.endif 166.endif
166.include "../../converters/libiconv/buildlink3.mk" 167.include "../../converters/libiconv/buildlink3.mk"
167.include "../../devel/zlib/buildlink3.mk" 168.include "../../devel/zlib/buildlink3.mk"
168.include "../../fonts/fontconfig/buildlink3.mk" 169.include "../../fonts/fontconfig/buildlink3.mk"
169.include "../../graphics/freetype2/buildlink3.mk" 170.include "../../graphics/freetype2/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk11/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/bootstrap.mk 2019/10/01 12:36:34 1.1
+++ pkgsrc/lang/openjdk11/bootstrap.mk 2019/10/14 07:58:50 1.2
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: bootstrap.mk,v 1.1 2019/10/01 12:36:34 tnn Exp $ 1# $NetBSD: bootstrap.mk,v 1.2 2019/10/14 07:58:50 tnn Exp $
2 2
3ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 3ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64
4BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz 4BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz
5SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/} 5SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/}
6BOOT.nb7-amd64= bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz 6BOOT.nb7-amd64= bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz
7SITES.${BOOT.nb7-amd64}=${MASTER_SITE_LOCAL:=openjdk11/} 7SITES.${BOOT.nb7-amd64}=${MASTER_SITE_LOCAL:=openjdk11/}
8 8
9.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) 9.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
10DISTFILES+= ${BOOT.nb7-i386} 10DISTFILES+= ${BOOT.nb7-i386}
11EXTRACT_ONLY+= ${BOOT.nb7-i386} 11EXTRACT_ONLY+= ${BOOT.nb7-i386}
12.endif 12.endif
13 13
14.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) 14.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
15DISTFILES+= ${BOOT.nb7-amd64} 15DISTFILES+= ${BOOT.nb7-amd64}
16EXTRACT_ONLY+= ${BOOT.nb7-amd64} 16EXTRACT_ONLY+= ${BOOT.nb7-amd64}
17.endif 17.endif
18 18
19CONFIGURE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib 19CONFIGURE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
20PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib 
21 20
22ALT_BOOTDIR= ${WRKDIR}/bootstrap 21ALT_BOOTDIR= ${WRKDIR}/bootstrap