components/runtime/openjdk-8/patches/0044-patch-jdk_make_Images.gmk.patch

   1 $NetBSD: patch-jdk_make_Images.gmk,v 1.3 2015/07/03 20:40:59 fhajny Exp $
   2
   3 Building ja_JP.UTF-8 manpages crashes the bootstrap JVM.
   4
   5 --- jdk/make/Images.gmk.orig
   6 +++ jdk/make/Images.gmk
   7 @@ -199,7 +199,7 @@
   8  $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
   9      $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
  10
  11 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
  12 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),NOMULTIARCHsolaris-64)
  13    define AddIsadirLink
  14      # Param 1 - src file
  15      # Param 2 - variable to add targets to
  16 @@ -243,7 +243,7 @@
  17  endif
  18
  19  JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
  20 -ifeq ($(OPENJDK_TARGET_OS), linux)
  21 +ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),)
  22    JDK_LIB_FILES += jexec
  23  endif
  24
  25 @@ -485,15 +485,9 @@
  26    endif
  27
  28    ifeq ($(OPENJDK_TARGET_OS), solaris)
  29 -    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
  30 -        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
  31 -        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
  32 -        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
  33 +    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES))
  34
  35 -    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
  36 -        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
  37 -        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
  38 -        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
  39 +    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES))
  40    endif
  41
  42    ifeq ($(OPENJDK_TARGET_OS), macosx)