diff options
| -rw-r--r-- | lang/openjdk8/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_Images.gmk | 49 |
2 files changed, 33 insertions, 20 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 2fe30f9b4b0..32bb21de13e 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/02/20 09:38:00 tnn Exp $ +$NetBSD: distinfo,v 1.9 2015/02/21 10:13:50 tnn Exp $ 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 @@ -58,7 +58,7 @@ SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c3 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 -SHA1 (patch-jdk_make_Images.gmk) = 3ce8b5ee63cb9e4a7a32294f52191bb81a695723 +SHA1 (patch-jdk_make_Images.gmk) = 7f3374554fa889ca2820f91f9dc1d34f2f39df0b SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 27c33019f28d38efc0ae2c019b3e6e44863e8253 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 08270f0a9e0eacf6416a09e300429ccdc1bcdad8 diff --git a/lang/openjdk8/patches/patch-jdk_make_Images.gmk b/lang/openjdk8/patches/patch-jdk_make_Images.gmk index 50308c23306..0e7fb17c71a 100644 --- a/lang/openjdk8/patches/patch-jdk_make_Images.gmk +++ b/lang/openjdk8/patches/patch-jdk_make_Images.gmk @@ -1,25 +1,38 @@ -$NetBSD: patch-jdk_make_Images.gmk,v 1.1 2015/02/08 08:41:25 tnn Exp $ +$NetBSD: patch-jdk_make_Images.gmk,v 1.2 2015/02/21 10:13:50 tnn Exp $ Building ja_JP.UTF-8 manpages crashes the bootstrap JVM. --- jdk/make/Images.gmk.orig 2015-02-02 15:37:11.000000000 +0000 +++ jdk/make/Images.gmk -@@ -411,12 +411,12 @@ ifneq ($(OPENJDK_TARGET_OS), windows) - $(install-file) +@@ -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 - define install-ja-manpage -- $(MKDIR) -p $(@D) -- $(CAT) $< \ -- | $(NATIVE2ASCII) -encoding eucJP \ -- | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \ -- | $(NATIVE2ASCII) -reverse -encoding $1 \ -- > $@ -+# $(MKDIR) -p $(@D) -+# $(CAT) $< \ -+# | $(NATIVE2ASCII) -encoding eucJP \ -+# | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \ -+# | $(NATIVE2ASCII) -reverse -encoding $1 \ -+# > $@ - endef +- 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 - $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + 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 |