60 lines
2.2 KiB
Text
60 lines
2.2 KiB
Text
$NetBSD: patch-ao,v 1.5 2015/02/08 23:40:09 tnn Exp $
|
|
|
|
- Support rhino
|
|
- Disable SunOS multiarch
|
|
- Building japanese manpages crashes bootstrap JVM
|
|
|
|
--- jdk/make/common/Release.gmk.orig 2015-01-26 15:20:57.000000000 +0000
|
|
+++ jdk/make/common/Release.gmk
|
|
@@ -66,7 +66,7 @@ EXPORTED_PRIVATE_PKGS = com.oracle.net \
|
|
# 64-bit solaris has a few special cases. We define the variable
|
|
# SOLARIS64 for use in this Makefile to easily test those cases
|
|
ifeq ($(PLATFORM), solaris)
|
|
- ifeq ($(ARCH_DATA_MODEL), 64)
|
|
+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
|
|
SOLARIS64 = true
|
|
IMAGE_BINDIR = bin/$(ARCH)
|
|
endif
|
|
@@ -193,6 +193,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1S
|
|
if [ -f $${manbase}/$${manpage} ] ; then \
|
|
$(CP) $${manbase}/$${manpage} $1/man/man1 ; \
|
|
for ja_encoding in $(JA_TARGET_ENCODINGS); do \
|
|
+ continue; \
|
|
ja_dir="ja"; \
|
|
if [ "$${ja_encoding}" != "$(JA_SOURCE_ENCODING)" ]; then \
|
|
ja_dir="ja_JP.$${ja_encoding}"; \
|
|
@@ -229,7 +230,7 @@ endif
|
|
INITIAL_IMAGE_JRE=initial-image-jre
|
|
INITIAL_IMAGE_JDK=initial-image-jdk
|
|
ifeq ($(PLATFORM), solaris)
|
|
- ifeq ($(ARCH_DATA_MODEL), 64)
|
|
+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
|
|
INITIAL_IMAGE_JRE=initial-image-jre-sol64
|
|
INITIAL_IMAGE_JDK=initial-image-jdk-sol64
|
|
endif
|
|
@@ -830,6 +831,7 @@ initial-image-jre:: initial-image-jre-se
|
|
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
|
|
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
|
|
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
|
|
+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
|
|
ifneq ($(JFR_JAR),)
|
|
$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
|
|
endif
|
|
@@ -931,6 +933,7 @@ ifeq ($(PLATFORM), macosx)
|
|
$(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/man1/javaws.1
|
|
else
|
|
$(RM) -r $(JDK_SERVER_IMAGE_DIR)
|
|
+ $(RM) -rf $(JDK_IMAGE_DIR)/man/ja
|
|
$(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR)
|
|
$(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo
|
|
$(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample
|
|
@@ -1159,7 +1162,8 @@ initial-image-jdk:: initial-image-jdk-se
|
|
@#
|
|
@# Swing BeanInfo generation
|
|
@#
|
|
- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
|
|
+ @# XXX javadoc
|
|
+ @# $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
|
|
ifneq ($(PLATFORM), windows)
|
|
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
|
|
endif # !windows
|