Update to openjdk7 build 92 snapshot.
This commit is contained in:
tnn
parent
d12ba189c3
commit
5dbf52a5b2
6 changed files with 55 additions and 46 deletions
|
|
@ -1,8 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.17 2010/02/11 09:44:26 tnn Exp $
|
||||
# $NetBSD: Makefile,v 1.18 2010/05/22 17:09:55 tnn Exp $
|
||||
|
||||
DISTNAME= openjdk-7-ea-src-b78-17_dec_2009
|
||||
PKGNAME= openjdk7-1.7.0.78.20100102
|
||||
PKGREVISION= 3
|
||||
DISTNAME= openjdk-7-ea-src-b92-06_may_2010
|
||||
PKGNAME= openjdk7-1.7.0.92.20100521
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
|
@ -18,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|||
|
||||
# diff between distfile and bsd-port branch. To check out, use:
|
||||
# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
|
||||
PATCHFILES+= jdk-7-bsd-port-78.20100102.diff.bz2
|
||||
PATCHFILES+= jdk-7-bsd-port-92.20100521.diff.bz2
|
||||
PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/}
|
||||
|
||||
CACERTS= cacerts-20091013.tar.bz2
|
||||
|
|
@ -105,6 +104,9 @@ post-extract:
|
|||
${WRKSRC}/jdk/src/share/classes
|
||||
cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \
|
||||
${WRKSRC}/jdk/src/share/classes
|
||||
${MKDIR} ${WRKSRC}/hotspot/make/bsd/makefiles
|
||||
cp ${WRKSRC}/hotspot/make/linux/makefiles/build_vm_def.sh \
|
||||
${WRKSRC}/hotspot/make/bsd/makefiles/build_vm_def.sh
|
||||
|
||||
do-build: ${WRKDIR}/stage3-done
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.4 2010/01/15 19:18:42 tnn Exp $
|
||||
@comment $NetBSD: PLIST,v 1.5 2010/05/22 17:09:55 tnn Exp $
|
||||
bin/openjdk7-jar
|
||||
bin/openjdk7-java
|
||||
bin/openjdk7-javac
|
||||
|
|
@ -192,6 +192,9 @@ java/openjdk7/demo/jfc/TableExample/src.zip
|
|||
java/openjdk7/demo/jpda/com/sun/tools/example/README
|
||||
java/openjdk7/demo/jpda/jpda.jar
|
||||
java/openjdk7/demo/jpda/src.zip
|
||||
java/openjdk7/demo/jvmti/compiledMethodLoad/README.txt
|
||||
java/openjdk7/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
|
||||
java/openjdk7/demo/jvmti/compiledMethodLoad/src.zip
|
||||
java/openjdk7/demo/jvmti/gctest/README.txt
|
||||
java/openjdk7/demo/jvmti/gctest/lib/libgctest.so
|
||||
java/openjdk7/demo/jvmti/gctest/src.zip
|
||||
|
|
@ -317,6 +320,7 @@ java/openjdk7/include/jdwpTransport.h
|
|||
java/openjdk7/include/jni.h
|
||||
java/openjdk7/include/jni_md.h
|
||||
java/openjdk7/include/jvmti.h
|
||||
java/openjdk7/include/jvmticmlr.h
|
||||
java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h
|
||||
java/openjdk7/include/${LOWER_OPSYS}/jni_md.h
|
||||
java/openjdk7/jre/ASSEMBLY_EXCEPTION
|
||||
|
|
@ -560,6 +564,7 @@ java/openjdk7/jre/lib/zi/America/Maceio
|
|||
java/openjdk7/jre/lib/zi/America/Managua
|
||||
java/openjdk7/jre/lib/zi/America/Manaus
|
||||
java/openjdk7/jre/lib/zi/America/Martinique
|
||||
java/openjdk7/jre/lib/zi/America/Matamoros
|
||||
java/openjdk7/jre/lib/zi/America/Mazatlan
|
||||
java/openjdk7/jre/lib/zi/America/Menominee
|
||||
java/openjdk7/jre/lib/zi/America/Merida
|
||||
|
|
@ -577,6 +582,7 @@ java/openjdk7/jre/lib/zi/America/Nome
|
|||
java/openjdk7/jre/lib/zi/America/Noronha
|
||||
java/openjdk7/jre/lib/zi/America/North_Dakota/Center
|
||||
java/openjdk7/jre/lib/zi/America/North_Dakota/New_Salem
|
||||
java/openjdk7/jre/lib/zi/America/Ojinaga
|
||||
java/openjdk7/jre/lib/zi/America/Panama
|
||||
java/openjdk7/jre/lib/zi/America/Pangnirtung
|
||||
java/openjdk7/jre/lib/zi/America/Paramaribo
|
||||
|
|
@ -591,6 +597,7 @@ java/openjdk7/jre/lib/zi/America/Recife
|
|||
java/openjdk7/jre/lib/zi/America/Regina
|
||||
java/openjdk7/jre/lib/zi/America/Resolute
|
||||
java/openjdk7/jre/lib/zi/America/Rio_Branco
|
||||
java/openjdk7/jre/lib/zi/America/Santa_Isabel
|
||||
java/openjdk7/jre/lib/zi/America/Santarem
|
||||
java/openjdk7/jre/lib/zi/America/Santiago
|
||||
java/openjdk7/jre/lib/zi/America/Santo_Domingo
|
||||
|
|
@ -616,6 +623,7 @@ java/openjdk7/jre/lib/zi/America/Yellowknife
|
|||
java/openjdk7/jre/lib/zi/Antarctica/Casey
|
||||
java/openjdk7/jre/lib/zi/Antarctica/Davis
|
||||
java/openjdk7/jre/lib/zi/Antarctica/DumontDUrville
|
||||
java/openjdk7/jre/lib/zi/Antarctica/Macquarie
|
||||
java/openjdk7/jre/lib/zi/Antarctica/Mawson
|
||||
java/openjdk7/jre/lib/zi/Antarctica/McMurdo
|
||||
java/openjdk7/jre/lib/zi/Antarctica/Palmer
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.8 2010/01/15 19:18:42 tnn Exp $
|
||||
$NetBSD: distinfo,v 1.9 2010/05/22 17:09:55 tnn Exp $
|
||||
|
||||
SHA1 (openjdk7/aaf3cf416fb4.tar.bz2) = 0699222ac14be906c2dbdc2db3aff3eeffcd7ac5
|
||||
RMD160 (openjdk7/aaf3cf416fb4.tar.bz2) = a88ae483d665163cf3dd302bd4f02c3ce551ab1c
|
||||
Size (openjdk7/aaf3cf416fb4.tar.bz2) = 4589271 bytes
|
||||
SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483
|
||||
RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d
|
||||
Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes
|
||||
SHA1 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 280e3a66c737c928facdeeb2533215e084513088
|
||||
RMD160 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 50d96c6c81deff07016649498e6efd7f950108cf
|
||||
Size (openjdk7/8dc6e1ff8ccf.tar.bz2) = 4581125 bytes
|
||||
SHA1 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
|
||||
RMD160 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5
|
||||
Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes
|
||||
SHA1 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = e51aafb9711a0a6b050d31ad4143b5799b20c88f
|
||||
RMD160 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 81b97b27f40fdb29004004e799af80a52504c378
|
||||
Size (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 24354825 bytes
|
||||
|
|
@ -27,12 +27,12 @@ Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = 24168404 by
|
|||
SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
|
||||
RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
|
||||
Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
|
||||
SHA1 (openjdk7/jdk-7-bsd-port-78.20100102.diff.bz2) = fc39ffbf4990b2422c1030b8838076ef81cd1db2
|
||||
RMD160 (openjdk7/jdk-7-bsd-port-78.20100102.diff.bz2) = dc37d32f7b3bd4b2e05386d90be2262c1be7bf7d
|
||||
Size (openjdk7/jdk-7-bsd-port-78.20100102.diff.bz2) = 558359 bytes
|
||||
SHA1 (openjdk7/openjdk-7-ea-src-b78-17_dec_2009.tar.bz2) = 754743a18644b86a042cf65e42bf6b6432eded45
|
||||
RMD160 (openjdk7/openjdk-7-ea-src-b78-17_dec_2009.tar.bz2) = 853b34e3b075c0f63482467cf0d6a6a542f41e7b
|
||||
Size (openjdk7/openjdk-7-ea-src-b78-17_dec_2009.tar.bz2) = 46678860 bytes
|
||||
SHA1 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 91b181ffa4b1f4a36500bccce07e4a4569f5340d
|
||||
RMD160 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = fb6c1c1215025bc5157148817acaea647b771771
|
||||
Size (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 561059 bytes
|
||||
SHA1 (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 4667055d18b76cd33c8e2cae48eebfe82b24c295
|
||||
RMD160 (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 272cd9e7bb83e70efafee62bb9c779c098eb2783
|
||||
Size (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 47211391 bytes
|
||||
SHA1 (openjdk7/rhino1_7R2.zip) = 3bb380cfb7f6febb87a64b2dee7fa308042f37e4
|
||||
RMD160 (openjdk7/rhino1_7R2.zip) = 58ae321829ac701e442bfbfed3d6f87b2bb6ba4c
|
||||
Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes
|
||||
|
|
@ -55,10 +55,10 @@ SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
|
|||
SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
|
||||
SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
|
||||
SHA1 (patch-ap) = 1cdd568c89e0525ed17e55300a51af15e9f19e08
|
||||
SHA1 (patch-ar) = 19abc4c858c730fb337d68d1d524db82c73ffa36
|
||||
SHA1 (patch-ar) = fe90aacc85fca6d0940d30c2457fff9787b3ecab
|
||||
SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
|
||||
SHA1 (patch-at) = 3b6c2268747c62f0008f67e8f3d5478e1905c551
|
||||
SHA1 (patch-au) = ba3414e924ffd82ca75ae1f8df507753141f2491
|
||||
SHA1 (patch-au) = ac6f8997f3411c068d58f53ad4064d3ffff1ff74
|
||||
SHA1 (patch-av) = be5bb72a3dd251f2a2822f7a1bea3b461b38d016
|
||||
SHA1 (patch-ba) = 2c56f89ea6297689fec7a7620f64ced752ed34c6
|
||||
SHA1 (patch-bc) = 301ba93a42ff228254ecb3c9748aa2555dfd601d
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# $NetBSD: icedtea-extras.mk,v 1.6 2010/02/02 23:12:53 jmcneill Exp $
|
||||
# $NetBSD: icedtea-extras.mk,v 1.7 2010/05/22 17:09:55 tnn Exp $
|
||||
|
||||
# Needed to extract icedtea
|
||||
EXTRACT_USING= bsdtar
|
||||
|
||||
DIST_SUBDIR= openjdk7
|
||||
|
||||
ICEDTEA= icedtea-aaf3cf416fb4
|
||||
ICEDTEA_TGZ= aaf3cf416fb4.tar.bz2
|
||||
ICEDTEA= icedtea-8dc6e1ff8ccf
|
||||
ICEDTEA_TGZ= 8dc6e1ff8ccf.tar.bz2
|
||||
SITES.${ICEDTEA_TGZ}= http://icedtea.classpath.org/hg/icedtea/archive/
|
||||
DISTFILES+= ${ICEDTEA_TGZ}
|
||||
EXTRACT_ONLY+= ${ICEDTEA_TGZ}
|
||||
|
|
@ -24,8 +24,8 @@ DISTFILES+= ${RHINO_TGZ}
|
|||
EXTRACT_ONLY+= ${RHINO_TGZ}
|
||||
|
||||
# fixme: Should depend on devel/apache-ant?
|
||||
ANT= apache-ant-1.7.1
|
||||
ANT_TGZ= ${ANT}-bin.zip
|
||||
ANT= apache-ant-1.8.1
|
||||
ANT_TGZ= ${ANT}-bin.tar.bz2
|
||||
SITES.${ANT_TGZ}= http://archive.apache.org/dist/ant/binaries/
|
||||
DISTFILES+= ${ANT_TGZ}
|
||||
EXTRACT_ONLY+= ${ANT_TGZ}
|
||||
|
|
@ -36,11 +36,11 @@ ICEDTEA_CONFIGURE_ARGS= \
|
|||
--with-xalan2-jar=${WRKDIR}/${XALAN}/xalan.jar \
|
||||
--with-xalan2-serializer-jar=${WRKDIR}/${XALAN}/serializer.jar \
|
||||
--with-xerces2-jar=${WRKDIR}/${XALAN}/xercesImpl.jar \
|
||||
--with-rhino=${WRKDIR}/${RHINO}/js.jar
|
||||
--with-rhino=${WRKDIR}/${RHINO}/js.jar \
|
||||
--with-jdk-home=${PREFIX}/java/openjdk7
|
||||
|
||||
.if defined(ICEDTEA_PACKAGE)
|
||||
CONFIGURE_ARGS+= ${ICEDTEA_CONFIGURE_ARGS}
|
||||
CONFIGURE_ARGS+= --with-jdk-home=${PREFIX}/java/openjdk7
|
||||
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gawk pkg-config autoconf automake
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-ar,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
|
||||
$NetBSD: patch-ar,v 1.2 2010/05/22 17:09:55 tnn Exp $
|
||||
|
||||
--- jdk/make/common/Defs.gmk.orig 2009-01-10 22:44:49.000000000 +0100
|
||||
+++ jdk/make/common/Defs.gmk
|
||||
@@ -220,7 +220,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
|
||||
ifeq ($(PLATFORM), windows)
|
||||
FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
|
||||
else
|
||||
- FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) -lfreetype
|
||||
+ FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) -Wl,-R$(FREETYPE_LIB_PATH) -lfreetype
|
||||
--- jdk/make/sun/font/Makefile.orig 2010-05-21 13:27:04.000000000 +0000
|
||||
+++ jdk/make/sun/font/Makefile
|
||||
@@ -129,7 +129,7 @@ else
|
||||
ifeq ($(USING_SYSTEM_FT_LIB), false)
|
||||
FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
|
||||
endif
|
||||
- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
|
||||
+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -Wl,-R$(FREETYPE_LIB_PATH) -lfreetype
|
||||
endif
|
||||
|
||||
ifdef ALT_FREETYPE_HEADERS_PATH
|
||||
library:: $(FREETYPE_LIB)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
$NetBSD: patch-au,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
|
||||
$NetBSD: patch-au,v 1.2 2010/05/22 17:09:55 tnn Exp $
|
||||
|
||||
--- jdk/make/Makefile.orig 2009-09-17 09:51:39.000000000 +0200
|
||||
--- jdk/make/Makefile.orig 2010-05-06 08:44:50.000000000 +0000
|
||||
+++ jdk/make/Makefile
|
||||
@@ -240,6 +240,8 @@ import_product:
|
||||
@@ -241,6 +241,7 @@ import_product:
|
||||
all build:: sanity-all post-sanity-all
|
||||
|
||||
SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
|
||||
+SUBDIRS += net/sourceforge/jnlp
|
||||
+
|
||||
all build::
|
||||
$(SUBDIRS-loop)
|
||||
SUBDIRS = tools java javax sun com
|
||||
+SUBDIRS += net/sourceforge/jnlp
|
||||
SUBDIRS_tools = launchers
|
||||
SUBDIRS_misc = org sunw jpda mkdemo mksample
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue