pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/openjdk11 openjdk11: don't leak WRKDIR references...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c6ae5945d2e
branches: trunk
changeset: 402661:7c6ae5945d2e
user: tnn <tnn%pkgsrc.org@localhost>
date: Mon Oct 14 07:58:50 2019 +0000
description:
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.
diffstat:
lang/openjdk11/Makefile | 5 +++--
lang/openjdk11/bootstrap.mk | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 0b28932e0902 -r 7c6ae5945d2e lang/openjdk11/Makefile
--- a/lang/openjdk11/Makefile Mon Oct 14 03:44:29 2019 +0000
+++ b/lang/openjdk11/Makefile Mon Oct 14 07:58:50 2019 +0000
@@ -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 @@
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 @@
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}
diff -r 0b28932e0902 -r 7c6ae5945d2e lang/openjdk11/bootstrap.mk
--- a/lang/openjdk11/bootstrap.mk Mon Oct 14 03:44:29 2019 +0000
+++ b/lang/openjdk11/bootstrap.mk Mon Oct 14 07:58:50 2019 +0000
@@ -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 @@
.endif
CONFIGURE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
-PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
ALT_BOOTDIR= ${WRKDIR}/bootstrap
Home |
Main Index |
Thread Index |
Old Index