pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openjdk11: add placeholders for bootstrap kits
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Thu Sep 26 15:25:00 2019 +0200
Changeset: deef023ced9b05d1ae7708640568827269c48835
Modified Files:
openjdk11/Makefile
openjdk11/bootstrap.mk
Log Message:
openjdk11: add placeholders for bootstrap kits
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=deef023ced9b05d1ae7708640568827269c48835
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openjdk11/Makefile | 3 ++-
openjdk11/bootstrap.mk | 23 ++++++++++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)
diffs:
diff --git a/openjdk11/Makefile b/openjdk11/Makefile
index 1c42f36c64..bfb3339182 100644
--- a/openjdk11/Makefile
+++ b/openjdk11/Makefile
@@ -154,7 +154,8 @@ ${WRKDIR}/cacerts.out:
mv ${.TARGET}.tmp ${.TARGET}
do-build:
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
+ rm -f ${WRKSRC}/make/data/fontconfig/*.orig
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
diff --git a/openjdk11/bootstrap.mk b/openjdk11/bootstrap.mk
index a3831037bb..02ed50fa55 100644
--- a/openjdk11/bootstrap.mk
+++ b/openjdk11/bootstrap.mk
@@ -1,5 +1,22 @@
# $NetBSD$
-.if empty(ALT_BOOTDIR) || !exists(${ALT_BOOTDIR}/bin/java)
-PKG_FAIL_REASON+= "ALT_BOOTDIR not set or jdk missing."
-PKG_FAIL_REASON+= "Obtaining bootstrap binaries is currently left as an exercise for the reader."
+
+ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64
+BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190926.tar.xz
+SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/}
+BOOT.nb7-amd64= bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190926.tar.xz
+SITES.${BOOT.nb7-amd64}=${MASTER_SITE_LOCAL:=openjdk11/}
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
+DISTFILES+= ${BOOT.nb7-i386}
+EXTRACT_ONLY+= ${BOOT.nb7-i386}
.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
+DISTFILES+= ${BOOT.nb7-amd64}
+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
Home |
Main Index |
Thread Index |
Old Index