CVS commit: pkgsrc/lang/openjdk8

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jul 22 10:46:56 UTC 2019

Modified Files:
        pkgsrc/lang/openjdk8: distinfo
Added Files:
        pkgsrc/lang/openjdk8/patches: patch-make_common_MakeBase.gmk

Log Message:
openjdk8: be compatible with src/usr.bin/printf/printf.c r1.49


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.68 pkgsrc/lang/openjdk8/distinfo:1.69
--- pkgsrc/lang/openjdk8/distinfo:1.68  Sun Feb 24 16:43:28 2019
+++ pkgsrc/lang/openjdk8/distinfo       Mon Jul 22 10:46:56 2019
@@ -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_Introspe
 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

Added files:

Index: pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk:1.1
--- /dev/null   Mon Jul 22 10:46:56 2019
+++ pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk Mon Jul 22 10:46:56 2019
@@ -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
+