lang/openjdk7: Add support for DragonFly x86_64

* Update bootstrap for i386-DragonFly
* Add bootstrap for x86_64-DragonFly
* Update patch-aa to handle missing EM_ALPHA definition (not used anyway)
* Add patch for hotspot to handle x86_64 in uname
* Update Makefile for parallel building of hotspot
* Allow platform DragonFly 3.x

Thanks for all the hard work building the bootstraps and testing:
Francois Tigeot
Chris Turner

5 files changed, 50 insertions, 17 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 700e7ca389b..5476be89454 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/05/08 09:24:15 abs Exp $
+# $NetBSD: Makefile,v 1.33 2012/05/12 21:01:47 marino Exp $
 
 DISTNAME=	openjdk-7-fcs-src-b147-27_jun_2011
 PKGNAME=	openjdk7-1.7.0.147.20110811
@@ -58,6 +58,7 @@ MAKE_ENV+=	ALT_X11_PATH=${X11BASE}
 MAKE_ENV+=	RHINO_JAR=${WRKDIR}/${RHINO}/js.jar
 
 MAKE_ENV+=	ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
+MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
 
 MAKE_ENV+=	HOTSPOT_BUILD_USER=pkgsrc
 MAKE_ENV+=	NO_DOCS=true
diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index 1602fc22b42..96f4c4bb976 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,13 +1,15 @@
-# $NetBSD: bootstrap.mk,v 1.5 2012/02/22 13:25:14 ryoon Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2012/05/12 21:01:47 marino Exp $
 
 ONLY_FOR_PLATFORM=	NetBSD-[56].*-i386 NetBSD-[56].*-x86_64
-ONLY_FOR_PLATFORM+=	DragonFly-2.*-i386
+ONLY_FOR_PLATFORM+=	DragonFly-[23].*
 
 BOOT.nb5-i386=		bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2
 BOOT.nb5-amd64=		bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2
 BOOT.nb6-i386=		bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2
 BOOT.nb6-amd64=		bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2
-BOOT.df210-i386=	bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2
+BOOT.df213-i386=	bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2
+# 1.7 partial bootstrap:
+BOOT.df213-amd64=	bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2
 BOOT.common-20110811=	bootstrap-jdk7-bin-common-20110811.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
@@ -35,8 +37,15 @@ EXTRACT_ONLY+=		${BOOT.nb6-amd64}
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDragonFly-*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df210-i386}
-EXTRACT_ONLY+=		${BOOT.df210-i386}
+MASTER_SITES+=		http://dl.wolfpond.org/openjdk7/
+DISTFILES+=		${BOOT.df213-i386}
+EXTRACT_ONLY+=		${BOOT.df213-i386}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64) || make(distinfo)
+MASTER_SITES+=		http://dl.wolfpond.org/openjdk7/
+DISTFILES+=		${BOOT.df213-amd64}
+EXTRACT_ONLY+=		${BOOT.df213-amd64}
 .endif
 
 .if !empty(DISTFILES:M*20110811*) || make(distinfo)
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 863aa159610..043bd61f5cd 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/08/21 22:57:54 tnn Exp $
+$NetBSD: distinfo,v 1.14 2012/05/12 21:01:47 marino Exp $
 
 SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
 RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
@@ -15,9 +15,12 @@ Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
 RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
 Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = ae75cba6f67b262f459fa9d28dc01fba150a95d4
-RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = 8b807f2f880603b40e90af88dcee73acd0be6240
-Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = 3590193 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 69ca558e447d89bcd9bf498b620e943fca27068e
+RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 65c3a00037486efc3076ec60d45a2a15ad1a8572
+Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 4106969 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = 8550a0c10bebd6843a926aad1a1eb619689e8936
+RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = e4e889d6c818f2e83939a04cb31fbeaca8eda278
+Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = 9285042 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461
 RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce
 Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes
@@ -51,7 +54,7 @@ Size (openjdk7/openjdk-7-fcs-src-b147-27_jun_2011.tar.bz2) = 44635821 bytes
 SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
-SHA1 (patch-aa) = fe3ebd1626d5170182bc11ee54c9c7c77361d032
+SHA1 (patch-aa) = 1d0363634b55fd51bb89dc414760aed79e26d021
 SHA1 (patch-ab) = ff032cf67ea66d93d7faad7f5ea40373fd4f6f01
 SHA1 (patch-ac) = c845134b3f7912b69c7773ca939f70d2dcd78fec
 SHA1 (patch-ad) = ab68ff2db078628069c925287c119c4cac6657f3
@@ -87,3 +90,4 @@ SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
 SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
 SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
 SHA1 (patch-bn) = 5b34da35e39e08c935c805b5ef7b2c8cc8d285da
+SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = bc339888ede68ada2682b803420a7c9515e5578f
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index 9943d115b61..ee08dee06c5 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,17 +1,21 @@
-$NetBSD: patch-aa,v 1.4 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-aa,v 1.5 2012/05/12 21:01:47 marino Exp $
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2011-08-11 12:31:36.000000000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2012-05-12 08:57:44.793207000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -131,7 +131,7 @@
+@@ -131,8 +131,11 @@
  # include <inttypes.h>
  # include <sys/ioctl.h>
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  # include <elf.h>
++#if !defined(EM_ALPHA)
++#define EM_ALPHA 0x9026
++#endif
  #endif
  
-@@ -2039,7 +2039,9 @@ void * os::dll_load(const char *filename
+ #ifdef __APPLE__
+@@ -2039,7 +2042,9 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
@@ -21,7 +25,7 @@ $NetBSD: patch-aa,v 1.4 2011/08/21 22:57:55 tnn Exp $
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-@@ -3559,7 +3561,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -3559,7 +3564,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -30,7 +34,7 @@ $NetBSD: patch-aa,v 1.4 2011/08/21 22:57:55 tnn Exp $
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
-@@ -3587,7 +3589,7 @@ OSReturn os::get_native_priority(const T
+@@ -3587,7 +3592,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
new file mode 100644
index 00000000000..f7e79977c89
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
@@ -0,0 +1,15 @@
+$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.1 2012/05/12 21:01:47 marino Exp $
+
+--- hotspot/make/bsd/makefiles/defs.make.orig	2012-05-12 16:55:32.316262000 +0000
++++ hotspot/make/bsd/makefiles/defs.make
+@@ -30,6 +30,10 @@ SLASH_JAVA ?= /java
+ 
+ # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+ ARCH:=$(shell uname -m)
++ifeq ($(ARCH),x86_64)
++  ARCH=amd64
++endif
++
+ PATH_SEP = :
+ ifeq ($(LP64), 1)
+   ARCH_DATA_MODEL ?= 64