diff options
| author | tnn <tnn> | 2015-02-21 10:13:50 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-02-21 10:13:50 +0000 |
| commit | fc9dab063a0d23fca7ca62f971d9cd10d4afc8b3 (patch) | |
| tree | fc40fc3e13c38db980a463f0a5bb8088a6f990c9 /lang/openjdk8/patches | |
| parent | 0fc0e7f48a9cde1f2057c5c2177889cb79bd5945 (diff) | |
| download | pkgsrc-fc9dab063a0d23fca7ca62f971d9cd10d4afc8b3.tar.gz | |
don't install a broken symlink
Diffstat (limited to 'lang/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_Images.gmk | 49 |
1 files changed, 31 insertions, 18 deletions
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 |