diff options
| author | tnn <tnn@pkgsrc.org> | 2019-07-22 10:46:56 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-07-22 10:46:56 +0000 |
| commit | 337da3ae75f38f2f17819b3bc68bbd21be882d9d (patch) | |
| tree | 4de2a88ee77a488b8c346d0254aaa1ee076ba086 /lang/openjdk8 | |
| parent | 1fba7112072b17d7370f82e9a6b16175afdb6690 (diff) | |
| download | pkgsrc-337da3ae75f38f2f17819b3bc68bbd21be882d9d.tar.gz | |
openjdk8: be compatible with src/usr.bin/printf/printf.c r1.49
Diffstat (limited to 'lang/openjdk8')
| -rw-r--r-- | lang/openjdk8/distinfo | 3 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-make_common_MakeBase.gmk | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index c65f16d265d..4fc69e0e224 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2019/02/24 16:43:28 jperkin Exp $ +$NetBSD: distinfo,v 1.69 2019/07/22 10:46:56 tnn Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -142,3 +142,4 @@ SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba +SHA1 (patch-make_common_MakeBase.gmk) = 95ea3be2561d0c4a6f533af070cba5dc4540cb61 diff --git a/lang/openjdk8/patches/patch-make_common_MakeBase.gmk b/lang/openjdk8/patches/patch-make_common_MakeBase.gmk new file mode 100644 index 00000000000..1eec5ce1d83 --- /dev/null +++ b/lang/openjdk8/patches/patch-make_common_MakeBase.gmk @@ -0,0 +1,25 @@ +$NetBSD: patch-make_common_MakeBase.gmk,v 1.1 2019/07/22 10:46:56 tnn Exp $ + +NetBSD's printf(1) doesn't handle the "--" end-of-options delimiter. +src/usr.bin/printf/printf.c rev1.49 + +--- make/common/MakeBase.gmk.orig 2019-02-19 13:34:21.000000000 +0000 ++++ make/common/MakeBase.gmk +@@ -57,7 +57,7 @@ endef + + define ListPathsSafely_Printf + $(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \ +- -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3) ++ "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3) + endef + + # Receipt example: +@@ -232,7 +232,7 @@ endef + define ListPathsSafelyNow_IfPrintf + ifneq (,$$(word $4,$$($1))) + $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1)))) +- $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3) ++ $$(shell printf "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3) + endif + endef + |