Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.20 2015/08/27 19:03:59 joerg Exp $
# $NetBSD: Makefile,v 1.41 2016/09/20 11:12:23 wiz Exp $
DISTNAME= openjdk-1.8.51-20150806
PKGNAME= openjdk8-1.8.51
DISTNAME= openjdk-1.8.102-20160811
PKGNAME= openjdk8-1.8.102
PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
@@ -20,26 +20,29 @@ DIST_SUBDIR= openjdk7
JAVA_NAME= openjdk8
JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
JAVA_WRAPPERS= jar java javac javadoc javah javap jps keytool orbd \
JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps keytool orbd \
policytool rmid rmiregistry servertool tnameserv
BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
HAS_CONFIGURE= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= common/autoconf/configure
CONFIG_SHELL= bash
CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub
CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
USE_LANGUAGES= c c++
USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
UNLIMIT_RESOURCES= datasize stacksize
WRKSRC= ${WRKDIR}/openjdk
PLIST_SRC+= ${PLIST_SRC_DFLT}
CHECK_SHLIBS_SKIP+= java/openjdk8/jre/lib/${LIBDIR_ARCH}/libinstrument.so
BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
PREPEND_PATH+= ${ALT_BOOTDIR}/bin
CONFIGURE_ARGS+= --disable-option-checking # for --with-libiconv-prefix
CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
@@ -56,10 +59,17 @@ CONFIGURE_ARGS+= --with-memory-size=768
CONFIGURE_ARGS+= --disable-precompiled-headers
CONFIGURE_ARGS+= --disable-ccache
CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION}
CONFIGURE_ARGS+= --with-update-version=u${PKGVERSION_NOREV:S/1.8.//}
CONFIGURE_ARGS+= --with-update-version=${PKGVERSION_NOREV:S/1.8.//}
CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/[a-ik-z]*
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/j[b-z]*
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/jar*
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java[a-z]*
NOT_PAX_MPROTECT_SAFE+= java/openjdk8/jre/bin/*
# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
MAKE_ENV+= JAVA_HOME=
MAKE_ENV+= CLASSPATH=
@@ -133,6 +143,11 @@ SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
SUBST_CLASSES+= zlibpath
SUBST_STAGE.zlibpath= pre-build
SUBST_FILES.zlibpath= jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk
SUBST_VARS.zlibpath= COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib
PLIST_VARS+= i386
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes
@@ -152,6 +167,13 @@ post-extract:
.if exists(/usr/lib/libstdc++.so.7)
${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
.endif
.if defined(TOOLS_PLATFORM.paxctl)
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
.endif
do-build: ${WRKDIR}/stage3-done
@@ -167,6 +189,13 @@ ${WRKDIR}/stage1-done:
# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
.if defined(TOOLS_PLATFORM.paxctl)
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
.endif
.if defined(BATCH)
@${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack
.endif

View File

@@ -1,10 +1,11 @@
@comment $NetBSD: PLIST,v 1.4 2015/05/05 17:07:39 abs Exp $
@comment $NetBSD: PLIST,v 1.6 2016/08/11 15:34:29 abs Exp $
bin/openjdk8-jar
bin/openjdk8-java
bin/openjdk8-javac
bin/openjdk8-javadoc
bin/openjdk8-javah
bin/openjdk8-javap
bin/openjdk8-jcmd
bin/openjdk8-jps
bin/openjdk8-keytool
bin/openjdk8-orbd
@@ -397,6 +398,7 @@ java/openjdk8/jre/lib/currency.data
java/openjdk8/jre/lib/ext/cldrdata.jar
java/openjdk8/jre/lib/ext/dnsns.jar
java/openjdk8/jre/lib/ext/localedata.jar
java/openjdk8/jre/lib/ext/jaccess.jar
java/openjdk8/jre/lib/ext/meta-index
java/openjdk8/jre/lib/ext/nashorn.jar
java/openjdk8/jre/lib/ext/sunec.jar

View File

@@ -1,4 +1,4 @@
# $NetBSD: bootstrap.mk,v 1.8 2015/07/05 21:03:05 fhajny Exp $
# $NetBSD: bootstrap.mk,v 1.9 2016/03/03 22:41:21 tnn Exp $
#
# This file contains a map of available binary bootstrap toolchains
# and which kit to use for each supported platform.
@@ -51,11 +51,6 @@ DISTFILES+= ${BOOT.nb5-amd64}
EXTRACT_ONLY+= ${BOOT.nb5-amd64}
.endif
.if ${OPSYS} == "SunOS"
BUILD_DEPENDS+= sun-jdk7-[0-9]*:../../lang/sun-jdk7
JDK_BOOTDIR= ${PREFIX}/java/sun-7
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo)
DISTFILES+= ${BOOT.nb6-i386}
EXTRACT_ONLY+= ${BOOT.nb6-i386}

View File

@@ -1,41 +1,53 @@
$NetBSD: distinfo,v 1.26 2015/09/12 16:56:48 joerg Exp $
$NetBSD: distinfo,v 1.40 2016/08/15 19:09:38 ryoon Exp $
SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 80b6585edd8be9e2b384a99532290c0054de7022760a8be8756b0555ea8d88c80709bb0162d48593d76b338be04d246008a14f780051fb460f59f85d76b314ab
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 4ef9bc133ce3fb328f1a6334561806759f6a840d
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 04c158993165acf63015ca931cf3d37a47513d74
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 94a4901ce78cff5439495f80ccd0eb0c2a53358dac8d614c7cf6ec46b452ca3d0b956f45490aef7fcd21b558fe1981a1c7611e801bc1506ff48e1b26b1e00de9
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 26972860 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 629f8d98530067dc78ba6521f37195ab819dc0d7
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 95fca1e15af0f48b529b525262f84b7a3c4f76fd
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 6514db6e244214169b85d37ea0a41655822a8db11922574e287802aef684cd753237521a5bffa6be1cd1e26e23c19851a5ea89fea54dbc935485903d524dd152
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 8c809f505435672f478036ddab436acdae032a2eed17698d36d74960fb17bde6f98b460c5904ac4737259e5e59d1a5447973a40085c633687d4b76ac3feda53c
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a
Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
SHA1 (openjdk7/openjdk-1.8.51-20150806.tar.xz) = 585abe036f6a2f76e17d9b4a24a755be6a9fc8c8
RMD160 (openjdk7/openjdk-1.8.51-20150806.tar.xz) = 9630e0c5ec8982a4aa45b238e6846c06981a8fa9
Size (openjdk7/openjdk-1.8.51-20150806.tar.xz) = 54540072 bytes
SHA1 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 6cf8885353739884775418c596cc769a61ec9e33
RMD160 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 09eab23e53f21050653fe67b44af6fa2dfaee368
SHA512 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 3f2906154fdbd7ed21de2ce2589c8eca077fae05d8f058afae915da86a4005f7ea6d76f61d9a215a8f0c8a394fed284ac4f10fa79f257d0b33ffb36a8aa5e615
Size (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 55231136 bytes
SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@@ -46,11 +58,11 @@ SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
SHA1 (patch-common_autoconf_boot-jdk.m4) = b7f8722a25c1c7ab489a9fd65cf60fb4af9530eb
SHA1 (patch-common_autoconf_generated-configure.sh) = 51e5dc909058b8ea26833a66c1d7eb0dafc3042d
SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
SHA1 (patch-common_autoconf_generated-configure.sh) = 16da232d94af0c4f5d9babd694321511636985dc
SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2d350a9b47883b3101e97cafa987104e2c4c54c4
SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
@@ -74,30 +86,30 @@ SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp)
SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d
SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977
SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7
SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = bb1d9b46b43b61e29e9bdf1e4311a486a81dc6f4
SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8a740e9f3f23c170
SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e
SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05
SHA1 (patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp) = 2d827ade6fcf0ba08fcd0390472cda17772bc0c5
SHA1 (patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp) = d2eaaae414810ab460ced512fdfc07385d60f4b8
SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa
SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = f35b8c1a1841f1239aa25d58d0b8749bb7b29ad2
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
SHA1 (patch-hotspot_test_compiler_native_TestDirtyInt.sh) = a24016e3594b49db232388974d40e8f4d411edcd
SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 48427d0ff3f29781d2beabf564e8bf55fa52dfdb
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 5fed2c4036080dd5230941bbb76025859e936267
SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 2f87fe9f0dd5a9298954d4da21938d147c368d42
SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac
SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f
SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e
SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
@@ -106,9 +118,9 @@ SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab9
SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508209f07512327afe3ec1179f64c
SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 3409e21ec151e407053fd510760c8b082f1beda5
SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801
SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7

View File

@@ -1,4 +1,4 @@
# $NetBSD: hacks.mk,v 1.5 2015/03/05 16:35:49 tnn Exp $
# $NetBSD: hacks.mk,v 1.6 2016/03/08 20:03:52 tnn Exp $
.if !defined(OPENJDK8_HACKS_MK)
OPENJDK8_HACKS_MK= # empty
@@ -46,9 +46,8 @@ apply-va-hack:
# JDK can correctly build itself. Compiling or running programs other than
# openjdk itself on such hardware may still cause unexpected behaviour.
#
COMPARE_SUBNORMAL_CMD= ${AWK} 'BEGIN {print (1E-307*1E-1==0?"yes":"no");exit;}'
BROKEN_IEEE_FLOATS:= ${COMPARE_SUBNORMAL_CMD:sh}
.if !empty(BROKEN_IEEE_FLOATS:Myes)
.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
PKG_HACKS+= broken-ieee-floats
SUBST_CLASSES+= fpu
SUBST_STAGE.fpu= pre-build

View File

@@ -1,11 +1,11 @@
$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.1 2015/06/27 22:37:42 joerg Exp $
$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.2 2016/02/08 14:45:39 ryoon Exp $
--- common/autoconf/boot-jdk.m4.orig 2015-06-27 20:05:32.000000000 +0000
--- common/autoconf/boot-jdk.m4.orig 2016-02-08 13:44:13.000000000 +0000
+++ common/autoconf/boot-jdk.m4
@@ -324,16 +324,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
@@ -334,16 +334,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BUILD_NUM_BITS" = x32; then
if test "x$BOOT_JDK_BITS" = x32; then
- JVM_MAX_HEAP=1100M
STACK_SIZE=768
else

View File

@@ -1,30 +1,8 @@
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.6 2015/07/03 20:40:59 fhajny Exp $
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.10 2016/07/19 12:32:15 jperkin Exp $
GCC support on SunOS.
Fix max heap.
Avoid requiring ALSA.
--- common/autoconf/generated-configure.sh.orig 2015-06-10 10:29:06.000000000 +0000
--- common/autoconf/generated-configure.sh.orig 2016-05-06 12:11:21.000000000 +0000
+++ common/autoconf/generated-configure.sh
@@ -6883,7 +6883,7 @@ test -n "$target_alias" &&
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
- sparcv9)
+ sparcv9|sparc64)
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
@@ -7030,7 +7030,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
- sparcv9)
+ sparcv9|sparc64)
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
@@ -8421,9 +8421,9 @@ done
@@ -8454,9 +8454,9 @@ done
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
if test "x$MAKE" != x; then
# User has supplied a make, test it.
@@ -37,7 +15,7 @@ Avoid requiring ALSA.
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
@@ -12543,7 +12543,7 @@ fi
@@ -12539,7 +12539,7 @@ fi
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -46,10 +24,10 @@ Avoid requiring ALSA.
# This is not a symbolic link! We are done!
break
fi
@@ -16217,16 +16217,15 @@ $as_echo_n "checking flags for boot jdk
@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BUILD_NUM_BITS" = x32; then
if test "x$BOOT_JDK_BITS" = x32; then
- JVM_MAX_HEAP=1100M
STACK_SIZE=768
else
@@ -64,7 +42,7 @@ Avoid requiring ALSA.
$ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
$ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
@@ -19320,7 +19319,7 @@ $as_echo "$as_me: Downloading build depe
@@ -19454,7 +19453,7 @@ $as_echo "(none, will use system headers
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
@@ -73,7 +51,7 @@ Avoid requiring ALSA.
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
# Do not probe for cc on AIX.
COMPILER_CHECK_LIST="xlc_r"
@@ -19774,7 +19773,7 @@ $as_echo_n "checking resolved symbolic l
@@ -19910,7 +19909,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -82,7 +60,7 @@ Avoid requiring ALSA.
# This is not a symbolic link! We are done!
break
fi
@@ -20212,7 +20211,7 @@ $as_echo_n "checking for resolved symbol
@@ -20348,7 +20347,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -91,7 +69,7 @@ Avoid requiring ALSA.
# This is not a symbolic link! We are done!
break
fi
@@ -20240,7 +20239,7 @@ $as_echo "no, keeping CC" >&6; }
@@ -20376,7 +20375,7 @@ $as_echo "no, keeping CC" >&6; }
COMPILER=$CC
COMPILER_NAME=$COMPILER_NAME
@@ -100,7 +78,7 @@ Avoid requiring ALSA.
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -21375,7 +21374,7 @@ $as_echo_n "checking resolved symbolic l
@@ -21511,7 +21510,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -109,7 +87,7 @@ Avoid requiring ALSA.
# This is not a symbolic link! We are done!
break
fi
@@ -21813,7 +21812,7 @@ $as_echo_n "checking for resolved symbol
@@ -21949,7 +21948,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -118,7 +96,7 @@ Avoid requiring ALSA.
# This is not a symbolic link! We are done!
break
fi
@@ -21841,7 +21840,7 @@ $as_echo "no, keeping CXX" >&6; }
@@ -21977,7 +21976,7 @@ $as_echo "no, keeping CXX" >&6; }
COMPILER=$CXX
COMPILER_NAME=$COMPILER_NAME
@@ -127,7 +105,7 @@ Avoid requiring ALSA.
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -29520,6 +29519,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
@@ -29390,6 +29389,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
fi
@@ -138,11 +116,12 @@ Avoid requiring ALSA.
+ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+ CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
+ CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
+ POST_STRIP_CMD="$STRIP -x"
+ fi
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
@@ -29661,6 +29668,13 @@ rm -f core conftest.err conftest.$ac_obj
@@ -29531,6 +29539,13 @@ rm -f core conftest.err conftest.$ac_obj
C_O_FLAG_NORM="-Os"
C_O_FLAG_NONE=""
;;
@@ -156,16 +135,16 @@ Avoid requiring ALSA.
*)
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
@@ -29862,7 +29875,7 @@ fi
@@ -29732,7 +29747,7 @@ fi
#
case $COMPILER_NAME in
gcc )
- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
-pipe \
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
case $OPENJDK_TARGET_CPU_ARCH in
@@ -30475,7 +30488,8 @@ $as_echo "alsa pulse x11" >&6; }
@@ -30343,7 +30358,8 @@ $as_echo "alsa pulse x11" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
$as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -175,7 +154,7 @@ Avoid requiring ALSA.
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
@@ -31701,7 +31715,11 @@ $as_echo "$as_me: WARNING: freetype not
@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
@@ -188,7 +167,7 @@ Avoid requiring ALSA.
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
@@ -34519,7 +34537,7 @@ $as_echo "$as_me: The path of FREETYPE_I
@@ -34373,7 +34393,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@@ -197,7 +176,7 @@ Avoid requiring ALSA.
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
@@ -34652,7 +34670,7 @@ $as_echo "$as_me: The path of FREETYPE_L
@@ -34506,7 +34526,7 @@ $as_echo "$as_me: The path of FREETYPE_L
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
else
@@ -206,7 +185,17 @@ Avoid requiring ALSA.
fi
fi
@@ -35923,7 +35941,7 @@ fi
@@ -35732,9 +35752,6 @@ fi
- if test "x$LLVM_CONFIG" != xllvm-config; then
- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
- fi
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
@@ -35777,7 +35794,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)

View File

@@ -1,15 +1,13 @@
$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.2 2015/02/21 20:21:56 tnn Exp $
$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.4 2016/08/15 19:09:38 ryoon Exp $
Fix architecture name.
--- hotspot/make/bsd/makefiles/defs.make.orig 2015-02-02 15:32:37.000000000 +0000
--- hotspot/make/bsd/makefiles/defs.make.orig 2016-08-11 05:37:43.000000000 +0000
+++ hotspot/make/bsd/makefiles/defs.make
@@ -29,7 +29,7 @@
SLASH_JAVA ?= /java
@@ -31,7 +31,7 @@ SLASH_JAVA ?= /java
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
-ARCH:=$(shell uname -m)
+ARCH:=$(shell uname -m | sed -e 's,x86_64,amd64,' -e 's,.*arm.*,arm,')
PATH_SEP = :
ifeq ($(LP64), 1)
ARCH_DATA_MODEL ?= 64
# ARCH can be set explicitly in spec.gmk
ifndef ARCH
- ARCH := $(shell uname -m)
+ ARCH := $(shell uname -m | sed -e 's,x86_64,amd64,' -e 's,.*arm.*,arm,')
# Fold little endian PowerPC64 into big-endian (if ARCH is set in
# hotspot-spec.gmk, this will be done by the configure script).
ifeq ($(ARCH),ppc64le)

View File

@@ -1,18 +0,0 @@
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp,v 1.1 2015/07/03 20:40:59 fhajny Exp $
GCC support.
--- hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.orig 2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp
@@ -65,7 +65,10 @@ public:
__asm__ __volatile__ ("movq %%fs:0, %0" : "=r"(rv));
return rv;
#else
- return gs_thread();
+ uintptr_t rv;
+ __asm__ __volatile__ ("movl %%gs:0, %0" : "=r"(rv));
+ return rv;
+// return gs_thread();
#endif // AMD64
#else //_GNU_SOURCE
return _raw_thread_id();

View File

@@ -1,14 +0,0 @@
$NetBSD: patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp,v 1.1 2015/06/13 14:55:52 tnn Exp $
compile.hpp:807:22: error: inline function 'Compile::locate_node_notes' is not defined [-Werror,-Wundefined-inline]
--- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig 2015-06-13 14:19:09.000000000 +0000
+++ hotspot/src/share/vm/ci/ciTypeFlow.cpp
@@ -36,6 +36,7 @@
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.inline.hpp"
#include "opto/compile.hpp"
+#include "opto/node.hpp"
#include "runtime/deoptimization.hpp"
#include "utilities/growableArray.hpp"

View File

@@ -1,21 +0,0 @@
$NetBSD: patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp,v 1.1 2015/06/13 23:57:25 tnn Exp $
Fix build with jdk-zero-vm option:
interpreterRuntime.cpp:412:25: error: no member named 'remove_activation_entry' in 'Interpreter'
return Interpreter::remove_activation_entry();
--- hotspot/src/share/vm/interpreter/interpreterRuntime.cpp.orig 2015-06-10 10:31:51.000000000 +0000
+++ hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -407,7 +407,11 @@ IRT_ENTRY(address, InterpreterRuntime::e
// during deoptimization so the interpreter needs to skip it when
// the frame is popped.
thread->set_do_not_unlock_if_synchronized(true);
+#ifdef CC_INTERP
+ return (address) -1;
+#else
return Interpreter::remove_activation_entry();
+#endif
}
// Need to do this check first since when _do_not_unlock_if_synchronized

View File

@@ -1,10 +1,17 @@
$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2015/07/03 20:40:59 fhajny Exp $
$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2016/08/15 19:09:38 ryoon Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2015-02-02 15:32:37.000000000 +0000
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2016-08-11 05:37:42.000000000 +0000
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -31,6 +31,10 @@
@@ -30,12 +30,16 @@
// This file holds compiler-dependent includes,
// globally used constants & types, class (forward)
// declarations and a few frequently used utility functions.
-#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif // __STDC_LIMIT_MACROS
#endif
+#ifdef SOLARIS
+#include <inttypes.h>
@@ -13,12 +20,3 @@ $NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2
#include <ctype.h>
#include <string.h>
#include <stdarg.h>
@@ -76,7 +76,7 @@
# include <sys/procfs.h>
# endif
-#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif // __STDC_LIMIT_MACROS

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-hotspot_test_compiler_native_TestDirtyInt.sh,v 1.1 2016/05/06 13:37:01 ryoon Exp $
--- hotspot/test/compiler/native/TestDirtyInt.sh.orig 2016-05-06 12:11:25.000000000 +0000
+++ hotspot/test/compiler/native/TestDirtyInt.sh
@@ -40,10 +40,10 @@ echo "TESTSRC=${TESTSRC}"
. ${TESTSRC}/../../test_env.sh
# set platform-dependent variables
-if [ $VM_OS == "linux" -a $VM_CPU == "sparcv9" ]; then
+if [ $VM_OS = "linux" -a $VM_CPU = "sparcv9" ]; then
echo "Testing on linux-sparc"
gcc_cmd=`which gcc`
- if [ "x$gcc_cmd" == "x" ]; then
+ if [ "x$gcc_cmd" = "x" ]; then
echo "WARNING: gcc not found. Cannot execute test." 2>&1
exit 0;
fi

View File

@@ -1,20 +1,26 @@
$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.2 2015/07/03 20:40:59 fhajny Exp $
$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.4 2016/07/19 12:32:15 jperkin Exp $
Change Sun Studio compiler flag to GCC equivalent.
(it is probably safe to remove the flag since we use the Zero port.)
--- jdk/make/CompileLaunchers.gmk.orig 2015-06-10 10:36:15.000000000 +0000
--- jdk/make/CompileLaunchers.gmk.orig 2016-05-06 12:11:21.000000000 +0000
+++ jdk/make/CompileLaunchers.gmk
@@ -458,7 +458,7 @@ else
endif
@@ -121,7 +121,7 @@ define SetupLauncher
endif
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- UNPACKEXE_CFLAGS += -xregs=no%appl
+ UNPACKEXE_CFLAGS += -mno-app-regs
UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
endif
ifeq ($(USE_EXTERNAL_LIBZ), true)
- $1_LDFLAGS_SUFFIX += -lz
+ $1_LDFLAGS_SUFFIX += @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
endif
@@ -553,9 +553,7 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/
$1_OUTPUT_DIR_ARG := $9
@@ -441,7 +441,7 @@ endif
# binary (at least on linux) which causes the size to differ between old and new build.
ifeq ($(USE_EXTERNAL_LIBZ), true)
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
- UNPACKEXE_ZIPOBJS := -lz
+ UNPACKEXE_ZIPOBJS := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
else
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
@@ -548,9 +548,7 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/
# jdk/make/java/Makefile
#
ifeq ($(OPENJDK_TARGET_OS), solaris)

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.1 2015/07/03 20:40:59 fhajny Exp $
$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.2 2016/03/12 07:31:02 tnn Exp $
GCC support.
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-06-10 10:36:24.000000000 +0000
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2016-02-19 14:48:27.000000000 +0000
+++ jdk/make/lib/Awt2dLibraries.gmk
@@ -695,7 +695,6 @@ $(eval $(call SetupNativeCompilation,BUI
$(SHARED_LIBRARY_FLAGS) \
@@ -12,3 +12,12 @@ GCC support.
CFLAGS_windows := -DCMS_IS_WINDOWS_, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -1070,7 +1069,7 @@ else # OPENJDK_TARGET_OS not windows
JAWT_LIBS += -lawt
endif
ifndef BUILD_HEADLESS_ONLY
- JAWT_LIBS += -lawt_xawt
+ JAWT_LIBS += $(X_LIBS) -lawt_xawt
else
JAWT_LIBS += -lawt_headless
HEADLESS_CFLAG += -DHEADLESS

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.2 2016/07/19 12:32:15 jperkin Exp $
Ensure we can find zlib.
--- jdk/make/lib/CoreLibraries.gmk.orig 2016-05-06 12:11:21.000000000 +0000
+++ jdk/make/lib/CoreLibraries.gmk
@@ -231,7 +231,7 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
BUILD_LIBZIP_EXCLUDES :=
ifeq ($(USE_EXTERNAL_LIBZ), true)
- LIBZ := -lz
+ LIBZ := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
LIBZIP_EXCLUDES += zlib-1.2.8
else
ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8

View File

@@ -1,4 +1,6 @@
$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.3 2015/07/03 20:40:59 fhajny Exp $
$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.4 2015/09/24 22:54:28 tnn Exp $
Fix list of platforms that do not have SCTP support.
--- jdk/make/lib/NioLibraries.gmk.orig 2015-06-10 10:36:24.000000000 +0000
+++ jdk/make/lib/NioLibraries.gmk

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-jdk_src_share_lib_security_java.security-bsd,v 1.1 2016/04/29 09:38:19 ryoon Exp $
--- jdk/src/share/lib/security/java.security-bsd.orig 2016-03-27 19:49:14.000000000 +0000
+++ jdk/src/share/lib/security/java.security-bsd
@@ -114,7 +114,7 @@ security.provider.9=sun.security.smartca
# specified, the "NativePRNG" implementation will be more preferred than
# SHA1PRNG in the Sun provider.
#
-securerandom.source=file:/dev/random
+securerandom.source=file:/dev/urandom
#
# A list of known strong SecureRandom implementations.

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.2 2015/09/24 22:54:28 tnn Exp $
patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
Ensure we use the bundled jpeg.
--- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig 2015-02-02 15:37:11.000000000 +0000
+++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c

View File

@@ -1,4 +1,6 @@
$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.2 2015/09/24 22:54:28 tnn Exp $
DragonFly support.
--- jdk/src/solaris/native/java/lang/java_props_md.c.orig 2015-02-02 15:37:12.000000000 +0000
+++ jdk/src/solaris/native/java/lang/java_props_md.c

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.c,v 1.2 2015/09/29 14:55:45 ryoon Exp $
--- jdk/src/solaris/native/java/net/net_util_md.c.orig 2015-02-02 15:37:12.000000000 +0000
--- jdk/src/solaris/native/java/net/net_util_md.c.orig 2015-09-28 21:01:39.000000000 +0000
+++ jdk/src/solaris/native/java/net/net_util_md.c
@@ -92,9 +92,9 @@ void setDefaultScopeID(JNIEnv *env, stru
@@ -96,9 +96,9 @@ void setDefaultScopeID(JNIEnv *env, stru
static jfieldID ni_defaultIndexID;
if (ni_class == NULL) {
jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
@@ -13,4 +13,4 @@ $NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.c,v 1.1 2015/02/08
+ CHECK_NULL_RETURN(c, 0);
ni_defaultIndexID = (*env)->GetStaticFieldID(
env, c, "defaultIndex", "I");
ni_class = c;
CHECK_NULL(ni_defaultIndexID);