CVS commit: pkgsrc/lang/openjdk11

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Oct 14 07:58:50 UTC 2019

Modified Files:
        pkgsrc/lang/openjdk11: Makefile bootstrap.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk11/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/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.2 pkgsrc/lang/openjdk11/Makefile:1.3
--- pkgsrc/lang/openjdk11/Makefile:1.2  Tue Oct  1 14:39:07 2019
+++ pkgsrc/lang/openjdk11/Makefile      Mon Oct 14 07:58:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/01 14:39:07 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/14 07:58:50 tnn Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -6,6 +6,7 @@ CATEGORIES=     lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT= openjdk-jdk11u
 GITHUB_TAG=     jdk-11.0.5+8-1
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://openjdk.java.net/
@@ -153,7 +154,7 @@ ${WRKDIR}/cacerts.out:
 
 do-build:
        rm -f ${WRKSRC}/make/data/fontconfig/*.orig
-       ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+       ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}

Index: pkgsrc/lang/openjdk11/bootstrap.mk
diff -u pkgsrc/lang/openjdk11/bootstrap.mk:1.1 pkgsrc/lang/openjdk11/bootstrap.mk:1.2
--- pkgsrc/lang/openjdk11/bootstrap.mk:1.1      Tue Oct  1 12:36:34 2019
+++ pkgsrc/lang/openjdk11/bootstrap.mk  Mon Oct 14 07:58:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2019/10/01 12:36:34 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2019/10/14 07:58:50 tnn Exp $
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 NetBSD-*-x86_64
 BOOT.nb7-i386=         bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz
@@ -17,6 +17,5 @@ EXTRACT_ONLY+=                ${BOOT.nb7-amd64}
 .endif
 
 CONFIGURE_ENV+=                LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
-PKGSRC_MAKE_ENV+=      LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
 
 ALT_BOOTDIR=           ${WRKDIR}/bootstrap