- put -D__STDC_LIMIT_MACROS on command line instead of patching it everywhere

- don't use ALT_JDK_IMPORT_PATH on SunOS, just build like on other platforms
- regen all bootstraps to facilitate removal of the +UseSerialGC hacks
- bootstrap binaries on FTP are now PGP signed
- remove a handful of obsolete patches

1 files changed, 20 insertions, 20 deletions

diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index 29030d5dd6f..a3e8bf72213 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.17 2015/02/22 08:40:07 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.18 2015/03/02 03:53:26 tnn Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -14,33 +14,30 @@
 #  8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.*
 #     and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}.
 #     This will ensure that MKLLVM=yes/MKGCC=no user in the future can run
-#     the bootstrap toolchain.
+#     the bootstrap toolchain. For targets that use jdk-zero-vm you need
+#     to include libffi.so.* as well.
 #  9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz
-# 10) gpg --sign -a bootstrap-xxx.tar.xz
+# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz
 # 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/}
 #
 # All binary kits from now on MUST have an accompanying PGP signature from
 # the person who prepared the kit. Unsigned binaries on ftp will be purged.
-#
-# Initial bootstrapping on a previously non-supported architecture
-# is not trivial to do with openjdk7. It is somewhat easier with openjdk8
-# which has improved cross-compile support. Note that openjdk8 cannot be used
-# for bootstrapping openjdk7 out of the box. (It is possible with hacks.)
 
 ONLY_FOR_PLATFORM=	NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
 ONLY_FOR_PLATFORM+=	NetBSD-7.*-sparc64
-ONLY_FOR_PLATFORM+=	DragonFly-[23].*-* SunOS-*-* FreeBSD-10.*-x86_64
+ONLY_FOR_PLATFORM+=	DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
 
-BOOT.nb5-i386=		bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
-BOOT.nb5-amd64=		bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2
-BOOT.nb6-i386=		bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
-BOOT.nb6-amd64=		bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
-BOOT.nb7-i386=		bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
-BOOT.nb7-amd64=		bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
-BOOT.nb7-sparc64=	bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz
+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
+BOOT.nb6-i386=		bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz
+BOOT.nb6-amd64=		bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz
+BOOT.nb7-i386=		bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz
+BOOT.nb7-amd64=		bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz
+BOOT.nb7-sparc64=	bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz
+BOOT.fbsd10-amd64=	bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz
+#XXX should be regenerated
 BOOT.dfly3.6-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
 BOOT.dfly3.8-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
-BOOT.fbsd10-amd64=	bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -82,7 +79,7 @@ DISTFILES+=		${BOOT.dfly3.6-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.dfly3.8-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.8-amd64}
 .endif
@@ -96,8 +93,11 @@ EXTRACT_ONLY+=		${BOOT.fbsd10-amd64}
 BUILDLINK_DEPMETHOD.sun-jdk7?=	build
 .include "../../lang/sun-jdk7/buildlink3.mk"
 #NB: sun-jdk7 includes sun-jre7/buildlink3.mk
-JDK_BOOTDIR=	${BUILDLINK_JAVA_PREFIX.sun-jre7:tA}
-MAKE_ENV+=	ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR}
+post-extract: copy-bootstrap-jdk
+.PHONY: copy-bootstrap-jdk
+copy-bootstrap-jdk:
+	${MKDIR} ${ALT_BOOTDIR}
+	cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR}
 .endif
 
 ALT_BOOTDIR=		${WRKDIR}/bootstrap