head	1.4;
access;
symbols;
locks; strict;
comment	@# @;


1.4
date	2022.08.15.12.23.05;	author tnn;	state dead;
branches;
next	1.3;
commitid	vvfURUShFSIelYPD;

1.3
date	2022.07.10.14.47.25;	author ryoon;	state Exp;
branches;
next	1.2;
commitid	4HQGihOPxXlBimLD;

1.2
date	2019.07.24.10.03.34;	author tnn;	state dead;
branches;
next	1.1;
commitid	IczPnCIKkaTbvhwB;

1.1
date	2019.07.22.10.46.56;	author tnn;	state Exp;
branches;
next	;
commitid	9KYFGBin9SK6O1wB;


desc
@@


1.4
log
@openjdk*: Security & bugfix update for the long term support branches

Upstream kindly merged many of the NetBSD-specific patches. Thanks! <3
@
text
@$NetBSD: patch-make_common_MakeBase.gmk,v 1.3 2022/07/10 14:47:25 ryoon Exp $

* If both of hg and git are unavailable, 'gmake images' stalls.

--- make/common/MakeBase.gmk.orig	2022-04-23 02:23:55.000000000 +0000
+++ make/common/MakeBase.gmk
@@@@ -318,11 +318,7 @@@@ SCM_TIP_FILECMD := $(PRINTF) "$(SCM):%s"
 # Emit the scm:id pair to $@@
 define GetSourceTips
 	$(CD) $(SRC_ROOT) ; \
-	if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
-	  $(ID_COMMAND) >> $@@ ; \
-	elif [ -f $(SCM_TIP_FILENAME) ] ; then \
-          $(SCM_TIP_FILECMD) >> $@@ ; \
-	fi;
+        echo 'release' >> $@@ ; \
 	$(PRINTF) "\n" >> $@@
 endef
 
@


1.3
log
@openjdk8: Update to 1.8.332

CHangelog:
Follow OpenJDK 8u332 GA.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@openjdk8: revert previous which didn't work w/ SunOS /bin/sh printf builtin
@
text
@d1 1
a1 1
$NetBSD: patch-make_common_MakeBase.gmk,v 1.1 2019/07/22 10:46:56 tnn Exp $
d3 1
a3 2
NetBSD's printf(1) doesn't handle the "--" end-of-options delimiter.
src/usr.bin/printf/printf.c rev1.49
d5 1
a5 1
--- make/common/MakeBase.gmk.orig	2019-02-19 13:34:21.000000000 +0000
d7 11
a17 16
@@@@ -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
@


1.1
log
@openjdk8: be compatible with src/usr.bin/printf/printf.c r1.49
@
text
@d1 1
a1 1
$NetBSD$
@