pkgsrc/openjdk7 DragonFly support

To: tech-pkg%NetBSD.org@localhost
Subject: pkgsrc/openjdk7 DragonFly support
From: Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>
Date: Wed, 26 Jun 2013 19:58:28 +0900 (JST)
Hi,

Here is patches for openjdk7's DragonFly support.
I have tested on DragonFly/amd64 3.4.1 and 3.5-DEVELOPMENT of 20130620.

Can I commit the patches during freeze?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/openjdk7/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile    15 Jun 2013 09:31:05 -0000      1.50
+++ Makefile    26 Jun 2013 10:56:13 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=      openjdk-7u6-fcs-src-b24-09_aug_2012
 PKGNAME=       openjdk7-1.7.21
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .zip
Index: bootstrap.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/openjdk7/bootstrap.mk,v
retrieving revision 1.8
diff -u -r1.8 bootstrap.mk
--- bootstrap.mk        15 Jun 2013 09:31:05 -0000      1.8
+++ bootstrap.mk        26 Jun 2013 10:56:13 -0000
@@ -10,8 +10,20 @@
 BOOT.df213-i386=       bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz
 # 1.7 partial bootstrap:
 BOOT.df213-amd64=      bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz
+BOOT.df33prebump-i386= bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz
+BOOT.df33prebump-amd64=        bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz
+BOOT.df35-i386=                bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz
+BOOT.df35-amd64=       bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz
 BOOT.common-20110811=  bootstrap-jdk7-bin-common-20110811.tar.bz2
 
+DFBSDBOOTSTRAPSITE=    http://dl.wolfpond.org/openjdk7/
+SITES.bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz= 
${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz=        
${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz= ${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz=        
${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz=  ${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz= ${DFBSDBOOTSTRAPSITE}
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=            ${BOOT.nb5-i386}
 EXTRACT_ONLY+=         ${BOOT.nb5-i386}
@@ -36,18 +48,38 @@
 EXTRACT_ONLY+=         ${BOOT.nb6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-*-i386) || make(distinfo)
-MASTER_SITES+=         http://dl.wolfpond.org/openjdk7/
+.if !empty(MACHINE_PLATFORM:MDragonFly-2.[0-9]*-i386) || \
+    !empty(MACHINE_PLATFORM:MDragonFly-3.[0-2]*-i386) || make(distinfo)
 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/
+.if !empty(MACHINE_PLATFORM:MDragonFly-2.[0-9]*-x86_64) || \
+    !empty(MACHINE_PLATFORM:MDragonFly-3.[0-2]*-x86_64) || make(distinfo)
 DISTFILES+=            ${BOOT.df213-amd64}
 EXTRACT_ONLY+=         ${BOOT.df213-amd64}
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[3-4]*-i386) || make(distinfo)
+DISTFILES+=            ${BOOT.df33prebump-i386}
+EXTRACT_ONLY+=         ${BOOT.df33prebump-i386}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[3-4]*-x86_64) || make(distinfo)
+DISTFILES+=            ${BOOT.df33prebump-amd64}
+EXTRACT_ONLY+=         ${BOOT.df33prebump-amd64}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[5-9]*-i386) || make(distinfo)
+DISTFILES+=            ${BOOT.df35-i386}
+EXTRACT_ONLY+=         ${BOOT.df35-i386}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[5-9]*-x86_64) || make(distinfo)
+DISTFILES+=            ${BOOT.df35-amd64}
+EXTRACT_ONLY+=         ${BOOT.df35-amd64}
+.endif
+
 .if !empty(DISTFILES:M*20110811*) || make(distinfo)
 DISTFILES+=            ${BOOT.common-20110811}
 EXTRACT_ONLY+=         ${BOOT.common-20110811}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/openjdk7/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- distinfo    23 Jun 2013 17:39:43 -0000      1.25
+++ distinfo    26 Jun 2013 10:56:14 -0000
@@ -1,8 +1,5 @@
 $NetBSD: distinfo,v 1.25 2013/06/23 17:39:43 jperkin Exp $
 
-SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 
7d3c9ee89536b82cd21c680088b1bced16017253
-RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 
a4a6a284579f43d2df3532d279e143d2f03c2c3f
-Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
 SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 
d9e3e83dd9664cfe1dcd4841c082db3f559af922
 RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 
a23e122b76b3dfed5be7bef3388041649df0b346
 Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
@@ -27,6 +24,18 @@
 SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 
baa7e0b2010c1cf918a88654b36db39935e532a4
 RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 
791f8db986905f2477adcb1784fea957cd9501d2
 Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 
bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 
e18704c72646ef4f66e37ea7a2feb8dad9008079
+RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 
b661b7a434d7d3c27614a2527b0fb2ed065d1f05
+Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 
bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 
d7994e2a485c3e4eca44e81f4215bb4c35b54d04
+RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 
bb9ba4fc83ec276c5e8decd53a6523eca1f6b819
+Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 
b9445fa4cc4674ba8b9330e45ae65c597f5fca10
+RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 
aa2443fa202f3ed8694b6d0e4031622b5da52283
+Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 
bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 
aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2
+RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 
5422564d6a5ba590b0906fdbb9de20091d7dabf2
+Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 
bytes
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 
905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 
0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
@@ -112,7 +121,7 @@
 SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 
43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 
3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = 
cf7c6226ad7c322f43df900be0e69686ca3a7a57
-SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 
7d244b859debf4f68e49fe6fb36fe2598951fcdb
+SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 
57b4c2a2851ce1bc11faf6066ed274695d856c97
 SHA1 (patch-jdk_make_com_sun_Makefile) = 
7b3b8163a4343b820f50b00babd4363c141ada67
 SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = 
bb258d4c2235ea780810d980b84b90a0380f3b46
 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 
65fa2d6191311766cdb5d9933d760cae7955f664
Index: patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
===================================================================
RCS file: 
/cvsroot/pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v
retrieving revision 1.1
diff -u -r1.1 patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
--- patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp     
15 Jun 2013 09:31:06 -0000      1.1
+++ patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp     
26 Jun 2013 10:56:14 -0000
@@ -2,7 +2,7 @@
 
 SunOS fixes.
 
---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig      
2013-02-19 23:21:59.000000000 +0000
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig      
2013-06-25 13:37:39.000000000 +0000
 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
 @@ -31,6 +31,10 @@
  // globally used constants & types, class (forward)
@@ -15,3 +15,20 @@
  #include <ctype.h>
  #include <string.h>
  #include <stdarg.h>
+@@ -241,6 +245,7 @@ extern "C" void breakpoint();
+ #define BREAKPOINT ::breakpoint()
+ #endif
+ 
++#include <sys/param.h> /* for __DragonFly_version */
+ // checking for nanness
+ #ifdef SOLARIS
+ #ifdef SPARC
+@@ -252,7 +257,7 @@ inline int g_isnan(float  f) { return is
+ inline int g_isnan(double f) { return isnand(f); }
+ #elif defined(__APPLE__)
+ inline int g_isnan(double f) { return isnan(f); }
+-#elif defined(__DragonFly__)
++#elif defined(__DragonFly__) && __DragonFly_version < 300500
+ inline int g_isnan(float  f) { return __isnanf(f); }
+ inline int g_isnan(double f) { return __isnand(f); }
+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE)

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3
Follow-Ups:
- Re: pkgsrc/openjdk7 DragonFly support
  - From: Jonathan Perkin
Prev by Date: Re: (MesaLib and defaults/mk.conf) Re: pkgsrc NetBSD 5.2/i386 2013-06-23 00:46
Next by Date: Re: pkgsrc/openjdk7 DragonFly support
Previous by Thread: (MesaLib and defaults/mk.conf) Re: pkgsrc NetBSD 5.2/i386 2013-06-23 00:46
Next by Thread: Re: pkgsrc/openjdk7 DragonFly support
Indexes:
Home | Main Index | Thread Index | Old Index