mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
57 lines
2.5 KiB
Plaintext
57 lines
2.5 KiB
Plaintext
$NetBSD: patch-jdk_make_Images.gmk,v 1.3 2015/07/03 20:40:59 fhajny Exp $
|
|
|
|
Building ja_JP.UTF-8 manpages crashes the bootstrap JVM.
|
|
|
|
--- jdk/make/Images.gmk.orig 2015-06-10 10:36:15.000000000 +0000
|
|
+++ jdk/make/Images.gmk
|
|
@@ -190,7 +190,7 @@ $(foreach f,$(filter $(OVERLAY_FILTER),$
|
|
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
|
|
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
|
|
|
|
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
|
|
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),NOMULTIARCHsolaris-64)
|
|
define AddIsadirLink
|
|
# Param 1 - src file
|
|
# Param 2 - variable to add targets to
|
|
@@ -234,7 +234,7 @@ ifeq ($(PROFILE), )
|
|
endif
|
|
|
|
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
|
|
-ifneq ($(findstring $(OPENJDK_TARGET_OS), linux bsd),)
|
|
+ifneq ($(findstring $(OPENJDK_TARGET_OS), linux bsd solaris),)
|
|
JDK_LIB_FILES += jexec
|
|
endif
|
|
|
|
@@ -454,25 +454,15 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
|
|
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
|
$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
|
|
|
|
- JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
|
|
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
|
|
- $(JRE_IMAGE_DIR)/man/ja
|
|
-
|
|
- JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
|
|
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
|
|
- $(JDK_IMAGE_DIR)/man/ja
|
|
+ JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES))
|
|
+
|
|
+ JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES))
|
|
endif
|
|
|
|
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
|
- JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
|
|
- $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
|
|
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
|
|
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
|
|
-
|
|
- JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
|
|
- $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
|
|
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
|
|
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
|
|
+ JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES))
|
|
+
|
|
+ JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES))
|
|
endif
|
|
|
|
endif # Windows
|