Re: Proposed update to bmake-20240711

[Simon Gerraty <sjg%crufty.net@localhost>]

On Fri, 12 Jul 2024 08:29:04 -0700, Simon Gerraty writes:
>>Simon or Roland, I'd appreciate if you could take a look at the current =
>
>>set of pkgsrc patches in files/patches/ and merge them upstream if =
>
>>appropriate.  Thanks to the addition of --with-force-machine-arch we no =
>
>>longer need to maintain a patch set for that, and it'd be great if we =
>
>>could just use pristine sources in the future.
>
>I will take a look.

My github fu is not great, but I think I saw the patches you mentioned,
I'm looking at applying the following (which is not exactly the same
but should be functionally equivalent):

Index: meta.c
===================================================================
RCS file: /volume/cvs/bmake/meta.c,v
retrieving revision 1.131
diff -u -p -r1.131 meta.c
--- meta.c	3 Jun 2024 02:38:12 -0000	1.131
+++ meta.c	12 Jul 2024 15:40:12 -0000
@@ -36,6 +36,9 @@
 # include "config.h"
 #endif
 #include <sys/stat.h>
+#if defined(HAVE_SYS_SELECT_H)
+# include <sys/select.h>
+#endif
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
 #elif !defined(HAVE_DIRNAME)
Index: util.c
===================================================================
RCS file: /volume/cvs/bmake/util.c,v
retrieving revision 1.52
diff -u -p -r1.52 util.c
--- util.c	4 Jan 2024 00:27:30 -0000	1.52
+++ util.c	12 Jul 2024 15:41:34 -0000
@@ -343,6 +343,10 @@ getcwd(path, sz)
 #include "sigact.h"
 #endif
 
+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+
 /* force posix signals */
 SignalProc
 bmake_signal(int s, SignalProc a)
Index: var.c
===================================================================
RCS file: /volume/cvs/bmake/var.c,v
retrieving revision 1.267
diff -u -p -r1.267 var.c
--- var.c	9 Jul 2024 18:45:02 -0000	1.267
+++ var.c	12 Jul 2024 15:48:59 -0000
@@ -138,6 +138,10 @@
 #include "job.h"
 #include "metachar.h"
 
+#ifndef SIZE_MAX
+#define SIZE_MAX 0xffffffffUL
+#endif
+
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
 MAKE_RCSID("$NetBSD: var.c,v 1.1135 2024/07/09 17:07:23 rillig Exp $");
 
Index: unit-tests/Makefile
===================================================================
RCS file: /volume/cvs/bmake/unit-tests/Makefile,v
retrieving revision 1.222
diff -u -p -r1.222 Makefile
--- unit-tests/Makefile	7 Jul 2024 16:34:32 -0000	1.222
+++ unit-tests/Makefile	12 Jul 2024 15:26:19 -0000
@@ -466,7 +466,7 @@ _shell := ${.SHELL:tA:T}
 .if ${_shell} == "dash" 
 # dash fails -x output
 BROKEN_TESTS+= opt-debug-x-trace
-.elif ${_shell} == "ksh"
+.elif ${_shell:N*ksh*} == ""
 BROKEN_TESTS+= sh-flags
 .endif