CVS commit: src/bin/pax

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 20:09:49 UTC 2023

Modified Files:
src/bin/pax: options.c

Log Message:
pax: need  for ffs()

Fixes warning as host tool on NetBSD 9.99


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/bin/pax/options.c

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

CVS commit: src/usr.bin/ctags

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 20:00:07 UTC 2023

Modified Files:
src/usr.bin/ctags: Makefile ctags.c

Log Message:
ctags: fix pointer-sign issues

Refactor init() to avoid -Wpointer-sign for host builds.
Uses same cast pattern used in ctags.h.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/ctags/Makefile \
src/usr.bin/ctags/ctags.c

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

Modified files:

Index: src/usr.bin/ctags/Makefile
diff -u src/usr.bin/ctags/Makefile:1.13 src/usr.bin/ctags/Makefile:1.14
--- src/usr.bin/ctags/Makefile:1.13	Fri Aug 10 12:10:27 2012
+++ src/usr.bin/ctags/Makefile	Thu Jul 20 20:00:07 2023
@@ -1,12 +1,8 @@
-#	$NetBSD: Makefile,v 1.13 2012/08/10 12:10:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2023/07/20 20:00:07 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	ctags
 CPPFLAGS+=-I${.CURDIR}
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
 
-.if !defined(HOSTPROGNAME)
-COPTS.ctags.c+=	-Wno-pointer-sign
-.endif
-
 .include 
Index: src/usr.bin/ctags/ctags.c
diff -u src/usr.bin/ctags/ctags.c:1.13 src/usr.bin/ctags/ctags.c:1.14
--- src/usr.bin/ctags/ctags.c:1.13	Sun Feb  3 03:19:29 2019
+++ src/usr.bin/ctags/ctags.c	Thu Jul 20 20:00:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $	*/
+/*	$NetBSD: ctags.c,v 1.14 2023/07/20 20:00:07 lukem Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
-__RCSID("$NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.14 2023/07/20 20:00:07 lukem Exp $");
 #endif /* not lint */
 
 #include 
@@ -194,7 +194,7 @@ void
 init(void)
 {
 	int		i;
-	unsigned const char	*sp;
+	const char	*sp;
 
 	for (i = 0; i < 256; i++) {
 		_wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
@@ -202,19 +202,19 @@ init(void)
 	}
 #define	CWHITE	" \f\t\n"
 	for (sp = CWHITE; *sp; sp++)	/* white space chars */
-		_wht[*sp] = YES;
+		_wht[(unsigned)*sp] = YES;
 #define	CTOKEN	" \t\n\"'#()[]{}=-+%*/&|^~!<>;,.:?"
 	for (sp = CTOKEN; *sp; sp++)	/* token ending chars */
-		_etk[*sp] = YES;
+		_etk[(unsigned)*sp] = YES;
 #define	CINTOK	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz0123456789"
 	for (sp = CINTOK; *sp; sp++)	/* valid in-token chars */
-		_itk[*sp] = YES;
+		_itk[(unsigned)*sp] = YES;
 #define	CBEGIN	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
 	for (sp = CBEGIN; *sp; sp++)	/* token starting chars */
-		_btk[*sp] = YES;
+		_btk[(unsigned)*sp] = YES;
 #define	CNOTGD	",;"
 	for (sp = CNOTGD; *sp; sp++)	/* invalid after-function chars */
-		_gd[*sp] = NO;
+		_gd[(unsigned)*sp] = NO;
 }
 
 /*

CVS commit: src/usr.bin/ctags

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 20:00:07 UTC 2023

Modified Files:
src/usr.bin/ctags: Makefile ctags.c

Log Message:
ctags: fix pointer-sign issues

Refactor init() to avoid -Wpointer-sign for host builds.
Uses same cast pattern used in ctags.h.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/ctags/Makefile \
src/usr.bin/ctags/ctags.c

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

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 16:22:30 UTC 2023

Modified Files:
src/tools/compat: configure nbtool_config.h.in

Log Message:
tools/compat: regen


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure
cvs rdiff -u -r1.55 -r1.56 src/tools/compat/nbtool_config.h.in

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

Modified files:

Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.104 src/tools/compat/configure:1.105
--- src/tools/compat/configure:1.104	Thu Jul 20 15:18:34 2023
+++ src/tools/compat/configure	Thu Jul 20 16:22:30 2023
@@ -5306,7 +5306,7 @@ for ac_func in atoll asprintf asnprintf 
 	dprintf esetfunc fgetln flock fpurge __fpurge futimes getline \
 	getopt getopt_long group_from_gid gid_from_group \
 	heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
-	mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
+	mkdtemp poll posix_spawn pread putc_unlocked pwcache_userdb pwcache_groupdb \
 	pwrite raise_default_signal random reallocarr reallocarray setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \

Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.55 src/tools/compat/nbtool_config.h.in:1.56
--- src/tools/compat/nbtool_config.h.in:1.55	Tue May 30 19:04:42 2023
+++ src/tools/compat/nbtool_config.h.in	Thu Jul 20 16:22:30 2023
@@ -1,6 +1,6 @@
 /* nbtool_config.h.in.  Generated from configure.ac by autoheader.  */
 
-/*  $NetBSD: nbtool_config.h.in,v 1.55 2023/05/30 19:04:42 lukem Exp $*/
+/*  $NetBSD: nbtool_config.h.in,v 1.56 2023/07/20 16:22:30 lukem Exp $*/
  
 #ifndef __NETBSD_NBTOOL_CONFIG_H__
 #define __NETBSD_NBTOOL_CONFIG_H__
@@ -581,6 +581,9 @@
 /* Define to 1 if you have the `poll' function. */
 #undef HAVE_POLL
 
+/* Define to 1 if you have the `posix_spawn' function. */
+#undef HAVE_POSIX_SPAWN
+
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 16:22:30 UTC 2023

Modified Files:
src/tools/compat: configure nbtool_config.h.in

Log Message:
tools/compat: regen


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure
cvs rdiff -u -r1.55 -r1.56 src/tools/compat/nbtool_config.h.in

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 16:21:24 UTC 2023

Modified Files:
src/tools/compat: configure.ac
src/usr.bin/xinstall: Makefile xinstall.c

Log Message:
tools: binstall can use posix_spawn() instead of vfork()


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/tools/compat/configure.ac
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xinstall/Makefile
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xinstall/xinstall.c

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

Modified files:

Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.106 src/tools/compat/configure.ac:1.107
--- src/tools/compat/configure.ac:1.106	Thu Jul 20 15:15:23 2023
+++ src/tools/compat/configure.ac	Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.106 2023/07/20 15:15:23 lukem Exp $
+#	$NetBSD: configure.ac,v 1.107 2023/07/20 16:21:23 lukem Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -228,7 +228,7 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf 
 	dprintf esetfunc fgetln flock fpurge __fpurge futimes getline \
 	getopt getopt_long group_from_gid gid_from_group \
 	heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
-	mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
+	mkdtemp poll posix_spawn pread putc_unlocked pwcache_userdb pwcache_groupdb \
 	pwrite raise_default_signal random reallocarr reallocarray setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \

Index: src/usr.bin/xinstall/Makefile
diff -u src/usr.bin/xinstall/Makefile:1.30 src/usr.bin/xinstall/Makefile:1.31
--- src/usr.bin/xinstall/Makefile:1.30	Sat Jun  3 09:09:19 2023
+++ src/usr.bin/xinstall/Makefile	Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2023/06/03 09:09:19 lukem Exp $
+#	$NetBSD: Makefile,v 1.31 2023/07/20 16:21:23 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include 
@@ -11,7 +11,6 @@ MAN=	install.1
 CPPFLAGS+=	-I${NETBSDSRCDIR}/usr.sbin/mtree
 
 .if (${HOSTPROG:U} == "")
-CPPFLAGS+=	-DHAVE_POSIX_SPAWN
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 .endif

Index: src/usr.bin/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.126 src/usr.bin/xinstall/xinstall.c:1.127
--- src/usr.bin/xinstall/xinstall.c:1.126	Fri Oct 30 20:05:00 2020
+++ src/usr.bin/xinstall/xinstall.c	Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: xinstall.c,v 1.126 2020/10/30 20:05:00 rillig Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.127 2023/07/20 16:21:23 lukem Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -64,6 +64,7 @@
 #include "nbtool_config.h"
 #else
 #define HAVE_FUTIMES 1
+#define HAVE_POSIX_SPAWN 1
 #define HAVE_STRUCT_STAT_ST_FLAGS 1
 #endif
 
@@ -77,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.126 2020/10/30 20:05:00 rillig Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.127 2023/07/20 16:21:23 lukem Exp $");
 #endif
 #endif /* not lint */
 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 16:21:24 UTC 2023

Modified Files:
src/tools/compat: configure.ac
src/usr.bin/xinstall: Makefile xinstall.c

Log Message:
tools: binstall can use posix_spawn() instead of vfork()


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/tools/compat/configure.ac
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xinstall/Makefile
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xinstall/xinstall.c

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

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:20:00 UTC 2023

Modified Files:
src/tools/make: configure
Added Files:
src/tools/make: aclocal.m4

Log Message:
tools/make: regen


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tools/make/aclocal.m4
cvs rdiff -u -r1.8 -r1.9 src/tools/make/configure

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

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:18:34 UTC 2023

Modified Files:
src/tools/compat: aclocal.m4 configure

Log Message:
tools/compat: regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/compat/aclocal.m4
cvs rdiff -u -r1.103 -r1.104 src/tools/compat/configure

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

Modified files:

Index: src/tools/compat/aclocal.m4
diff -u src/tools/compat/aclocal.m4:1.1 src/tools/compat/aclocal.m4:1.2
--- src/tools/compat/aclocal.m4:1.1	Tue May 30 19:04:42 2023
+++ src/tools/compat/aclocal.m4	Thu Jul 20 15:18:34 2023
@@ -13,3 +13,4 @@
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_include([buildaux/ax_check_compile_flag.m4])
+m4_include([buildaux/nb_check_cc_flag.m4])

Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.103 src/tools/compat/configure:1.104
--- src/tools/compat/configure:1.103	Sat Jun  3 09:18:14 2023
+++ src/tools/compat/configure	Thu Jul 20 15:18:34 2023
@@ -6278,7 +6278,7 @@ done
 
 
 
-cc_fail_unknown=
+nb_cv_check_cc_flags=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5
 $as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; }
 if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then :
@@ -6309,17 +6309,13 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5
 $as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; }
 if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then :
-  as_fn_append cc_fail_unknown -Werror=unknown-warning-option
+  nb_cv_check_cc_flags=-Werror=unknown-warning-option
 else
   :
 fi
 
 
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-no-cpp-precomp" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-no-cpp-precomp" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -no-cpp-precomp" >&5
 $as_echo_n "checking whether C compiler accepts -no-cpp-precomp... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
@@ -6327,7 +6323,7 @@ if eval \${$as_CACHEVAR+:} false; then :
 else
 
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS $cc_fail_unknown -no-cpp-precomp"
+  CFLAGS="$CFLAGS $nb_cv_check_cc_flags -no-cpp-precomp"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6359,14 +6355,7 @@ fi
 
 
 
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Waddress-of-packed-member" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Waddress-of-packed-member" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Waddress-of-packed-member" >&5
 $as_echo_n "checking whether C compiler accepts -Waddress-of-packed-member... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
@@ -6374,7 +6363,7 @@ if eval \${$as_CACHEVAR+:} false; then :
 else
 
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS $cc_fail_unknown -Waddress-of-packed-member"
+  CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Waddress-of-packed-member"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6405,14 +6394,7 @@ fi
 
 
 
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Wcast-function-type" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Wcast-function-type" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-function-type" >&5
 $as_echo_n "checking whether C compiler accepts -Wcast-function-type... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
@@ -6420,7 +6402,7 @@ if eval \${$as_CACHEVAR+:} false; then :
 else
 
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS $cc_fail_unknown -Wcast-function-type"
+  CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Wcast-function-type"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6451,14 +6433,7 @@ fi
 
 
 
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Werror=address-of-packed-member" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Werror=address-of-packed-member" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=address-of-packed-member" >&5
 $as_echo_n "checking whether C compiler accepts -Werror=address-of-packed-member... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
@@ -6466,7 +6441,7 @@ if eval \${$as_CACHEVAR+:} false; then :
 else
 
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS $cc_fail_unknown -Werror=address-of-packed-member"
+  CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Werror=address-of-packed-member"
   cat confdefs.h - <<_ACEOF 

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:18:34 UTC 2023

Modified Files:
src/tools/compat: aclocal.m4 configure

Log Message:
tools/compat: regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/compat/aclocal.m4
cvs rdiff -u -r1.103 -r1.104 src/tools/compat/configure

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

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:16:44 UTC 2023

Modified Files:
src/tools/make: Makefile.regen buildmake.sh.in configure.ac

Log Message:
tools/make: build with -Wno-deprecated-declarations

Use NB_CHECK_CC_FLAG() from ../tools/compat to determine
if the compiler supports -Wno-deprecated-declarations.
Avoids sooking about vfork() on macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/make/Makefile.regen
cvs rdiff -u -r1.17 -r1.18 src/tools/make/buildmake.sh.in
cvs rdiff -u -r1.10 -r1.11 src/tools/make/configure.ac

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

Modified files:

Index: src/tools/make/Makefile.regen
diff -u src/tools/make/Makefile.regen:1.1 src/tools/make/Makefile.regen:1.2
--- src/tools/make/Makefile.regen:1.1	Sun Oct 14 20:25:35 2007
+++ src/tools/make/Makefile.regen	Thu Jul 20 15:16:44 2023
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.regen,v 1.1 2007/10/14 20:25:35 apb Exp $
+#	$NetBSD: Makefile.regen,v 1.2 2023/07/20 15:16:44 lukem Exp $
 
 .include "bsd.own.mk"
 
 # Run "${TOOLDIR}/bin/nbmake-${MACHINE} -f Makefile.regen" by hand after
 # editing configure.ac.  See more detailed instructions in configure.ac.
 regen:
-	cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoconf
+	cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoreconf -I../compat/buildaux

Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.17 src/tools/make/buildmake.sh.in:1.18
--- src/tools/make/buildmake.sh.in:1.17	Thu Jul 20 15:13:27 2023
+++ src/tools/make/buildmake.sh.in	Thu Jul 20 15:16:44 2023
@@ -1,5 +1,5 @@
 #! /bin/sh
-#	$NetBSD: buildmake.sh.in,v 1.17 2023/07/20 15:13:27 lukem Exp $
+#	$NetBSD: buildmake.sh.in,v 1.18 2023/07/20 15:16:44 lukem Exp $
 #
 # buildmake.sh.in - Autoconf-processed shell script for building make(1).
 #
@@ -24,7 +24,7 @@ docmd()
 }
 
 for f in $MKSRCDIR/*.c; do
-	docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ \
+	docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ @NOWARNFLAGS@ \
 		-D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\" -c "$f"
 done
 

Index: src/tools/make/configure.ac
diff -u src/tools/make/configure.ac:1.10 src/tools/make/configure.ac:1.11
--- src/tools/make/configure.ac:1.10	Thu Jul 20 15:12:36 2023
+++ src/tools/make/configure.ac	Thu Jul 20 15:16:44 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.10 2023/07/20 15:12:36 lukem Exp $
+#	$NetBSD: configure.ac,v 1.11 2023/07/20 15:16:44 lukem Exp $
 #
 # Autoconf definition file for make.
 #
@@ -25,6 +25,9 @@
 AC_INIT([make], [noversion], [bin-bug-peo...@netbsd.org])
 AC_CONFIG_FILES([buildmake.sh])
 
+m4_pattern_forbid([^AX_])
+m4_pattern_forbid([^NB_])
+
 AC_PATH_PROG([BSHELL], [sh])
 if test x"$BSHELL" = x; then
 AC_MSG_ERROR([sh must be somewhere on \$PATH, or BSHELL must be defined])
@@ -47,12 +50,17 @@ AC_SEARCH_LIBS([regfree], [rx posix])
 
 AC_CHECK_FUNCS([setenv strdup strerror strftime vsnprintf])
 
+dnl NOWARNFLAGS: compiler flags to suppress unnecessary warnings:
+dnl   -Wno-deprecated-declarations
+dnl
+NB_CHECK_CC_FLAG([-Wno-deprecated-declarations], [NOWARNFLAGS])
+
 AC_OUTPUT()
 
 dnl Display results
 dnl
 AC_MSG_NOTICE([== configure results for make ===])
-m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS], [dnl
+m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS NOWARNFLAGS], [dnl
 AC_MSG_NOTICE(m4_format([%-32s],NB_VAR)[$NB_VAR])
 ])
 AC_MSG_NOTICE([])

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:16:44 UTC 2023

Modified Files:
src/tools/make: Makefile.regen buildmake.sh.in configure.ac

Log Message:
tools/make: build with -Wno-deprecated-declarations

Use NB_CHECK_CC_FLAG() from ../tools/compat to determine
if the compiler supports -Wno-deprecated-declarations.
Avoids sooking about vfork() on macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/make/Makefile.regen
cvs rdiff -u -r1.17 -r1.18 src/tools/make/buildmake.sh.in
cvs rdiff -u -r1.10 -r1.11 src/tools/make/configure.ac

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

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:15:23 UTC 2023

Modified Files:
src/tools/compat: configure.ac
Added Files:
src/tools/compat/buildaux: nb_check_cc_flag.m4

Log Message:
tools/compat: provide nb_check_cc_flag.m4

Implement m4 macro NB_CHECK_CC_FLAG(FLAG, [VAR=FLAG_DERIVED])
Determine if the C compiler supports FLAG,
and sets output variable VAR to FLAG if FLAG is supported.

If VAR is not provided, default to FLAG_DERIVED, which is
FLAG converted to upper-case and all special characters
replaced with "_", and the result prepended with "CC_".
FLAG_DERIVED is appended to the m4 macro NB_CHECK_CC_FLAG_VARS.
E.g., if FLAG is "-Wexample=yes", FLAG_DERIVED is "CC_WEXAMPLE_YES".

This is implemented in separate buildaux/nb_check_cc_flag.m4,
based on configure's NB_CC_FLAG(), but supports VAR override.

Adapt configure from internal NB_CC_FLAG() to NB_CHECK_CC_FLAG().

(Note: AX_CHECK_COMPILE_FLAG() from autoconf-archive could be enhanced
to support the clang and gcc workarounds I've implemented here.)


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/tools/compat/configure.ac
cvs rdiff -u -r0 -r1.1 src/tools/compat/buildaux/nb_check_cc_flag.m4

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

Modified files:

Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.105 src/tools/compat/configure.ac:1.106
--- src/tools/compat/configure.ac:1.105	Sat Jun  3 09:10:13 2023
+++ src/tools/compat/configure.ac	Thu Jul 20 15:15:23 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.105 2023/06/03 09:10:13 lukem Exp $
+#	$NetBSD: configure.ac,v 1.106 2023/07/20 15:15:23 lukem Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -327,50 +327,27 @@ dnl
 dnl Set per-warning CC_* variables if supported by HOST_CC.
 dnl
 
-dnl clang needs to fail if given an unknown -WWARN.
-cc_fail_unknown=
-AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],
- [AS_VAR_APPEND([cc_fail_unknown], [-Werror=unknown-warning-option])])
-
-dnl NB_CC_FLAG(FLAG)
-dnl	Determine if HOST_CC supports FLAG, and
-dnl	sets output variable VAR (derived from FLAG)
-dnl	to FLAG if it is supported.
-dnl
-AC_DEFUN([NB_CC_FLAG], [dnl
-m4_pushdef([NB_FLAG], [$1])
-dnl gcc ignores unknown -Wno-WARN but will fail unknown equivalent -WWARN.
-m4_pushdef([NB_WFLAG], m4_bpatsubst(NB_FLAG, [^-Wno-], [-W]))
-m4_pushdef([NB_VAR], [CC]m4_translit(NB_FLAG, [-=a-z], [__A-Z]))
-AX_CHECK_COMPILE_FLAG(NB_WFLAG, [AS_VAR_SET(NB_VAR,NB_FLAG)], [], [$cc_fail_unknown])
-AC_SUBST(NB_VAR)
-m4_append([NB_CC_FLAG_VARS], NB_VAR, [ ])
-m4_popdef([NB_FLAG])
-m4_popdef([NB_WFLAG])
-m4_popdef([NB_VAR])
-]) dnl NB_CC_FLAG
-
 dnl Disable use of pre-compiled headers on Darwin.
-NB_CC_FLAG([-no-cpp-precomp])
+NB_CHECK_CC_FLAG([-no-cpp-precomp])
 
 dnl Detect HOST_CC support for  CC_* warnings
-NB_CC_FLAG([-Wno-address-of-packed-member])
-NB_CC_FLAG([-Wno-cast-function-type])
-NB_CC_FLAG([-Wno-error=address-of-packed-member])
-NB_CC_FLAG([-Wno-format-overflow])
-NB_CC_FLAG([-Wno-format-truncation])
-NB_CC_FLAG([-Wno-implicit-fallthrough])
-NB_CC_FLAG([-Wno-maybe-uninitialized])
-NB_CC_FLAG([-Wno-return-local-addr])
-NB_CC_FLAG([-Wno-stringop-overflow])
-NB_CC_FLAG([-Wno-stringop-truncation])
+NB_CHECK_CC_FLAG([-Wno-address-of-packed-member])
+NB_CHECK_CC_FLAG([-Wno-cast-function-type])
+NB_CHECK_CC_FLAG([-Wno-error=address-of-packed-member])
+NB_CHECK_CC_FLAG([-Wno-format-overflow])
+NB_CHECK_CC_FLAG([-Wno-format-truncation])
+NB_CHECK_CC_FLAG([-Wno-implicit-fallthrough])
+NB_CHECK_CC_FLAG([-Wno-maybe-uninitialized])
+NB_CHECK_CC_FLAG([-Wno-return-local-addr])
+NB_CHECK_CC_FLAG([-Wno-stringop-overflow])
+NB_CHECK_CC_FLAG([-Wno-stringop-truncation])
 
 AC_OUTPUT()
 
 dnl Display results
 dnl
-AC_MSG_NOTICE([= Configuration results =])
-m4_foreach_w([NB_VAR], [CC LIBS ]NB_CC_FLAG_VARS, [dnl
+AC_MSG_NOTICE([= configure results for compat ==])
+m4_foreach_w([NB_VAR], [CC LIBS ]NB_CHECK_CC_FLAG_VARS, [dnl
 AC_MSG_NOTICE(m4_format([%-40s],NB_VAR)[$NB_VAR])
 ])
 AC_MSG_NOTICE([])

Added files:

Index: src/tools/compat/buildaux/nb_check_cc_flag.m4
diff -u /dev/null src/tools/compat/buildaux/nb_check_cc_flag.m4:1.1
--- /dev/null	Thu Jul 20 15:15:23 2023
+++ src/tools/compat/buildaux/nb_check_cc_flag.m4	Thu Jul 20 15:15:23 2023
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2023, Luke Mewburn 
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+#
+
+#
+# _NB_CHECK_CC_FLAG_PREPARE
+#	Check for flags to force a compiler (e.g., clang) to fail
+#	if given an unknown -WWARN, and s

CVS commit: src/tools/compat

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:15:23 UTC 2023

Modified Files:
src/tools/compat: configure.ac
Added Files:
src/tools/compat/buildaux: nb_check_cc_flag.m4

Log Message:
tools/compat: provide nb_check_cc_flag.m4

Implement m4 macro NB_CHECK_CC_FLAG(FLAG, [VAR=FLAG_DERIVED])
Determine if the C compiler supports FLAG,
and sets output variable VAR to FLAG if FLAG is supported.

If VAR is not provided, default to FLAG_DERIVED, which is
FLAG converted to upper-case and all special characters
replaced with "_", and the result prepended with "CC_".
FLAG_DERIVED is appended to the m4 macro NB_CHECK_CC_FLAG_VARS.
E.g., if FLAG is "-Wexample=yes", FLAG_DERIVED is "CC_WEXAMPLE_YES".

This is implemented in separate buildaux/nb_check_cc_flag.m4,
based on configure's NB_CC_FLAG(), but supports VAR override.

Adapt configure from internal NB_CC_FLAG() to NB_CHECK_CC_FLAG().

(Note: AX_CHECK_COMPILE_FLAG() from autoconf-archive could be enhanced
to support the clang and gcc workarounds I've implemented here.)


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/tools/compat/configure.ac
cvs rdiff -u -r0 -r1.1 src/tools/compat/buildaux/nb_check_cc_flag.m4

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

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:13:27 UTC 2023

Modified Files:
src/tools/make: buildmake.sh.in

Log Message:
tools/make/buildmake.sh: fix quoting

autoconf 2.69 generates @DEFS@ with definitions with
quoted embedded spaces, so rework how docmd() is invoked
to avoid weird quoting issues.

As part of this, remove all the shell variables containing @var@
and just use @var@ directly.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tools/make/buildmake.sh.in

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

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:13:27 UTC 2023

Modified Files:
src/tools/make: buildmake.sh.in

Log Message:
tools/make/buildmake.sh: fix quoting

autoconf 2.69 generates @DEFS@ with definitions with
quoted embedded spaces, so rework how docmd() is invoked
to avoid weird quoting issues.

As part of this, remove all the shell variables containing @var@
and just use @var@ directly.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tools/make/buildmake.sh.in

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

Modified files:

Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.16 src/tools/make/buildmake.sh.in:1.17
--- src/tools/make/buildmake.sh.in:1.16	Sun Jul 26 09:17:24 2020
+++ src/tools/make/buildmake.sh.in	Thu Jul 20 15:13:27 2023
@@ -1,5 +1,5 @@
 #! /bin/sh
-#	$NetBSD: buildmake.sh.in,v 1.16 2020/07/26 09:17:24 rillig Exp $
+#	$NetBSD: buildmake.sh.in,v 1.17 2023/07/20 15:13:27 lukem Exp $
 #
 # buildmake.sh.in - Autoconf-processed shell script for building make(1).
 #
@@ -7,30 +7,26 @@
 : ${NETBSDSRCDIR:=@srcdir@/../..}
 MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
 
-_CC="@CC@"
-
-_CFLAGS="@CPPFLAGS@"
-_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
-_CFLAGS="${_CFLAGS} @DEFS@"
-_CFLAGS="${_CFLAGS} @CFLAGS@"
-
-_LDFLAGS="@LDFLAGS@ @LIBS@"
-
-docmd () {
+docmd()
+{
+	local msg=$1
+	local tgt=$2
+	shift 2
 	case "${MAKEVERBOSE:-2}" in
 	0)
 		;;
 	1)
-		echo "$1 ${2##*/}" ;;
+		echo "${msg} ${tgt##*/}" ;;
 	*)
-		echo "$3" ;;
+		echo "$*" ;;
 	esac
-	$3 || exit 1
+	"$@" || exit 1
 }
 
 for f in $MKSRCDIR/*.c; do
-	docmd "compile " "$f" "${_CC} ${_CFLAGS} -c $f"
+	docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ \
+		-D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\" -c "$f"
 done
 
 docmd "   link " "${_TOOL_PREFIX:-nb}make" \
-	"${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"
+	@CC@ -o ${_TOOL_PREFIX:-nb}make *.o @LDFLAGS@ @LIBS@

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:12:37 UTC 2023

Modified Files:
src/tools/make: configure.ac

Log Message:
tools/make/configure.ac: style tweaks

Consistently use () in zero argument macro calls.
Display results at end.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/make/configure.ac

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

CVS commit: src/tools/make

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Thu Jul 20 15:12:37 UTC 2023

Modified Files:
src/tools/make: configure.ac

Log Message:
tools/make/configure.ac: style tweaks

Consistently use () in zero argument macro calls.
Display results at end.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/make/configure.ac

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

Modified files:

Index: src/tools/make/configure.ac
diff -u src/tools/make/configure.ac:1.9 src/tools/make/configure.ac:1.10
--- src/tools/make/configure.ac:1.9	Sun Oct 14 20:26:47 2007
+++ src/tools/make/configure.ac	Thu Jul 20 15:12:36 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.9 2007/10/14 20:26:47 apb Exp $
+#	$NetBSD: configure.ac,v 1.10 2023/07/20 15:12:36 lukem Exp $
 #
 # Autoconf definition file for make.
 #
@@ -23,28 +23,36 @@
 #
 
 AC_INIT([make], [noversion], [bin-bug-peo...@netbsd.org])
-AC_CONFIG_FILES(buildmake.sh)
+AC_CONFIG_FILES([buildmake.sh])
 
-AC_PATH_PROG(BSHELL, sh)
+AC_PATH_PROG([BSHELL], [sh])
 if test x"$BSHELL" = x; then
 AC_MSG_ERROR([sh must be somewhere on \$PATH, or BSHELL must be defined])
 fi
-AC_DEFINE_UNQUOTED(DEFSHELL_CUSTOM, "${BSHELL}")
+AC_DEFINE_UNQUOTED([DEFSHELL_CUSTOM], "${BSHELL}")
 
 # Make sure we have POSIX regex ability.
-AC_CHECK_HEADER(regex.h,, AC_MSG_ERROR([POSIX regex.h is required]))
+AC_CHECK_HEADER([regex.h],, AC_MSG_ERROR([POSIX regex.h is required]))
 
 # If we don't have , we need to use select(2).
-AC_CHECK_HEADER(poll.h,, AC_DEFINE(USE_SELECT))
+AC_CHECK_HEADER([poll.h],, AC_DEFINE(USE_SELECT))
 
 # regcomp() and regexec() are also names of functions in the old V8
 # regexp package.  To avoid them, we need to find out who has regfree().
 
 dnl # Cygwin: We *MUST* look at -lregex *before* the "no libs" condition.
 dnl # Thus AC_CHECK_LIB(regex...) comes first, and AC_SEARCHLIBS next.
-AC_CHECK_LIB(regex, regfree)
-AC_SEARCH_LIBS(regfree, rx posix)
+AC_CHECK_LIB([regex], [regfree])
+AC_SEARCH_LIBS([regfree], [rx posix])
 
-AC_CHECK_FUNCS(setenv strdup strerror strftime vsnprintf)
+AC_CHECK_FUNCS([setenv strdup strerror strftime vsnprintf])
 
-AC_OUTPUT
+AC_OUTPUT()
+
+dnl Display results
+dnl
+AC_MSG_NOTICE([== configure results for make ===])
+m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS], [dnl
+AC_MSG_NOTICE(m4_format([%-32s],NB_VAR)[$NB_VAR])
+])
+AC_MSG_NOTICE([])

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul 19 15:40:38 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: consistency fix


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/BUILDING
cvs rdiff -u -r1.146 -r1.147 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.157 src/BUILDING:1.158
--- src/BUILDING:1.157	Tue Jul 18 16:59:57 2023
+++ src/BUILDING	Wed Jul 19 15:40:38 2023
@@ -65,7 +65,7 @@ FILES
 The source to this document, in mdoc(7) format.  Used to
 generate BUILDING.
 
- external, sys/external
+ external/, sys/external/
 Sources and build infrastructure for components imported
 (mostly) unchanged from upstream maintainers, sorted by
 applicable license.  This is (slowly) replacing the

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.146 src/doc/BUILDING.mdoc:1.147
--- src/doc/BUILDING.mdoc:1.146	Tue Jul 18 16:59:57 2023
+++ src/doc/BUILDING.mdoc	Wed Jul 19 15:40:38 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.146 2023/07/18 16:59:57 lukem Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.147 2023/07/19 15:40:38 lukem Exp $
 .\"
 .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -180,7 +180,7 @@ format.
 Used to generate
 .Pa BUILDING .
 .
-.It Pa external , sys/external
+.It Pa external/ , sys/external/
 Sources and build infrastructure for components imported (mostly) unchanged
 from upstream maintainers, sorted by applicable license.
 This is (slowly) replacing the

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul 19 15:40:38 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: consistency fix


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/BUILDING
cvs rdiff -u -r1.146 -r1.147 src/doc/BUILDING.mdoc

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Tue Jul 18 16:59:57 UTC 2023

Modified Files:
src: BUILDING UPDATING build.sh
src/doc: BUILDING.mdoc

Log Message:
build.sh: use mk.conf (if present) as MAKECONF

Set MAKECONF to mk.conf in the same directory as build.sh
(i.e., the top of the source tree) if mk.conf is present.
This means unprivileged users can benefit from mk.conf(5)
semantics without write privileges to /etc/mk.conf, and
also simplifies per-source-directory configuration.

Fail early if $MAKECONF is empty, since build.sh will fail
anyway after rebuilding nbmake.

Ensure that the computed MAKECONF isn't empty, and then
always set MAKECONF in the makewrapper (nbmake-$MACHINE).

Improve some formatting consistency in BUILDING.mdoc,
(even if BUILDING is generated without markup).


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/BUILDING
cvs rdiff -u -r1.340 -r1.341 src/UPDATING
cvs rdiff -u -r1.372 -r1.373 src/build.sh
cvs rdiff -u -r1.145 -r1.146 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.156 src/BUILDING:1.157
--- src/BUILDING:1.156	Wed Jul  5 16:41:12 2023
+++ src/BUILDING	Tue Jul 18 16:59:57 2023
@@ -9,12 +9,16 @@ REQUIREMENTS
  same NetBSD architecture) or cross compiling (on another architecture or
  OS).
 
+ This source tree contains the build.sh shell script which supports both
+ native and cross builds of NetBSD.
+
  This source tree contains a special subtree, "tools", which uses the host
  system to create a build toolchain for the target architecture.  The host
  system must have at least C and C++ compilers in order to create the
- toolchain (make is not required); all other tools are created as part of
- the NetBSD build process.  (See the Environment variables section below
- if you need to override or manually select your compilers.)
+ toolchain (make(1) is not required); all other tools (including make(1)
+ as nbmake) are created as part of the NetBSD build process.  (See the
+ Environment variables section below if you need to override or manually
+ select your compilers.)
 
  Note: Within this document, cross-references to manual pages are to the
  NetBSD manual pages, not the host system manual pages.  The mdoc(7)
@@ -71,6 +75,12 @@ FILES
 "Reachover" build structure for modular Xorg; the source
 is in X11SRCDIR.
 
+ mk.confOptional source tree specific mk.conf(5), used (if
+present) instead of /etc/mk.conf unless MAKECONF is
+defined.
+
+Note: Not part of the NetBSD source repository.
+
  regress/, tests/
 Regression test harness.  Can be cross-compiled, but only
 run natively.  tests/ uses the atf(7) test framework;
@@ -164,7 +174,9 @@ CONFIGURATION
 
  Note: Only settable in the process environment.
 
- Default: "/etc/mk.conf".
+ Default: "/etc/mk.conf", although build.sh will set the
+ default to the full path to mk.conf if the latter is
+ present in the same directory as build.sh.
 
  MAKEFLAGS   Flags to invoke make(1) with.
 
@@ -819,4 +831,4 @@ CAVEATS
  in object directories.  Instead, one may have to manually remove the
  files.  Consult the UPDATING file for notices concerning this.
 
-NetBSD   July 5, 2023   NetBSD
+NetBSD   July 18, 2023  NetBSD

Index: src/UPDATING
diff -u src/UPDATING:1.340 src/UPDATING:1.341
--- src/UPDATING:1.340	Tue Jul 11 15:05:17 2023
+++ src/UPDATING	Tue Jul 18 16:59:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.340 2023/07/11 15:05:17 martin Exp $
+$NetBSD: UPDATING,v 1.341 2023/07/18 16:59:57 lukem Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,10 @@ See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^
 
+20230718:
+	build.sh will use mk.conf in the same directory as build.sh instead
+	of /etc/mk.conf, unless MAKECONF is already defined in the environment.
+
 20230604:
 	Building native kernels with the installed make(1) instead of
 	the $TOOLDIR/bin/nbmake-${arch} wrapper will fail if userland

Index: src/build.sh
diff -u src/build.sh:1.372 src/build.sh:1.373
--- src/build.sh:1.372	Tue Jun 13 16:56:00 2023
+++ src/build.sh	Tue Jul 18 16:59:57 2023
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.372 2023/06/13 16:56:00 christos Exp $
+#	$NetBSD: build.sh,v 1.373 2023/07/18 16:59:57 lukem Exp $
 #
 # Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 # All rights 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Tue Jul 18 16:59:57 UTC 2023

Modified Files:
src: BUILDING UPDATING build.sh
src/doc: BUILDING.mdoc

Log Message:
build.sh: use mk.conf (if present) as MAKECONF

Set MAKECONF to mk.conf in the same directory as build.sh
(i.e., the top of the source tree) if mk.conf is present.
This means unprivileged users can benefit from mk.conf(5)
semantics without write privileges to /etc/mk.conf, and
also simplifies per-source-directory configuration.

Fail early if $MAKECONF is empty, since build.sh will fail
anyway after rebuilding nbmake.

Ensure that the computed MAKECONF isn't empty, and then
always set MAKECONF in the makewrapper (nbmake-$MACHINE).

Improve some formatting consistency in BUILDING.mdoc,
(even if BUILDING is generated without markup).


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/BUILDING
cvs rdiff -u -r1.340 -r1.341 src/UPDATING
cvs rdiff -u -r1.372 -r1.373 src/build.sh
cvs rdiff -u -r1.145 -r1.146 src/doc/BUILDING.mdoc

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

CVS commit: src/sys/rump/share/man/man7

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 20:00:11 UTC 2023

Modified Files:
src/sys/rump/share/man/man7: rumpkernel.7

Log Message:
use rumpkernel.github.io as the entry point


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/share/man/man7/rumpkernel.7

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

CVS commit: src/sys/rump/share/man/man7

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 20:00:11 UTC 2023

Modified Files:
src/sys/rump/share/man/man7: rumpkernel.7

Log Message:
use rumpkernel.github.io as the entry point


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/share/man/man7/rumpkernel.7

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

Modified files:

Index: src/sys/rump/share/man/man7/rumpkernel.7
diff -u src/sys/rump/share/man/man7/rumpkernel.7:1.4 src/sys/rump/share/man/man7/rumpkernel.7:1.5
--- src/sys/rump/share/man/man7/rumpkernel.7:1.4	Fri Jul 14 23:21:53 2023
+++ src/sys/rump/share/man/man7/rumpkernel.7	Sat Jul 15 20:00:11 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: rumpkernel.7,v 1.4 2023/07/14 23:21:53 lukem Exp $
+.\" $NetBSD: rumpkernel.7,v 1.5 2023/07/15 20:00:11 lukem Exp $
 .\"
 .\" Copyright (c) 2008-2014 Antti Kantee.  All rights reserved.
 .\"
@@ -88,7 +88,7 @@ allocation fails, the rump kernel will a
 available by invoking its internal pagedaemon to flush caches.
 .El
 .Sh SEE ALSO
-.Lk https://github.com/rumpkernel/wiki/wiki
+.Lk https://rumpkernel.github.io
 .Rs
 .%A Antti Kantee
 .%A Justin Cormack

CVS commit: src/lib/librumpuser

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 09:22:44 UTC 2023

Modified Files:
src/lib/librumpuser: configure

Log Message:
librumpuser/configure: regen for URL fixes


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/configure

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

Modified files:

Index: src/lib/librumpuser/configure
diff -u src/lib/librumpuser/configure:1.5 src/lib/librumpuser/configure:1.6
--- src/lib/librumpuser/configure:1.5	Thu Mar  5 00:25:39 2015
+++ src/lib/librumpuser/configure	Sat Jul 15 09:22:44 2023
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for rumpuser-posix 999.
 #
-# Report bugs to .
+# Report bugs to .
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,10 +267,10 @@ fi
 $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
 $as_echo "$0: Please tell bug-autoc...@gnu.org and
-$0: http://rumpkernel.org/ about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: https://github.com/rumpkernel/ about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -582,7 +582,7 @@ PACKAGE_NAME='rumpuser-posix'
 PACKAGE_TARNAME='rumpuser-posix'
 PACKAGE_VERSION='999'
 PACKAGE_STRING='rumpuser-posix 999'
-PACKAGE_BUGREPORT='http://rumpkernel.org/'
+PACKAGE_BUGREPORT='https://github.com/rumpkernel/'
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
@@ -1326,7 +1326,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to .
+Report bugs to .
 _ACEOF
 ac_status=$?
 fi
@@ -1548,9 +1548,9 @@ $as_echo "$as_me: WARNING: $2: see the A
 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## - ##
-## Report this to http://rumpkernel.org/ ##
-## - ##"
+( $as_echo "## - ##
+## Report this to https://github.com/rumpkernel/ ##
+## - ##"
  ) | sed "s/^/$as_me: WARNING: /" >&2
 ;;
 esac
@@ -3073,7 +3073,7 @@ else
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		   && LARGE_OFF_T % 2147483647 == 1)
 		  ? 1 : -1];
@@ -3119,7 +3119,7 @@ else
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		   && LARGE_OFF_T % 2147483647 == 1)
 		  ? 1 : -1];
@@ -3143,7 +3143,7 @@ rm -f core conftest.err conftest.$ac_obj
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		   && LARGE_OFF_T % 2147483647 == 1)
 		  ? 1 : -1];
@@ -3188,7 +3188,7 @@ else
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		   && LARGE_OFF_T % 2147483647 == 1)
 		  ? 1 : -1];
@@ -3212,7 +3212,7 @@ rm -f core conftest.err conftest.$ac_obj
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C 

CVS commit: src/lib/librumpuser

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 09:22:44 UTC 2023

Modified Files:
src/lib/librumpuser: configure

Log Message:
librumpuser/configure: regen for URL fixes


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/configure

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

CVS commit: src/lib/librumpuser

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 09:21:36 UTC 2023

Modified Files:
src/lib/librumpuser: configure.ac

Log Message:
librumpuser/configure: fix missing directory warning

Use "build-aux" instead of the non-existant "m4" as the
directory for AC_CONFIG_MACRO_DIR.

Avoids autoreconf warning:
  aclocal: warning: couldn't open directory 'm4': No such file or directory

No change to generated files.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/configure.ac

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

Modified files:

Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.6 src/lib/librumpuser/configure.ac:1.7
--- src/lib/librumpuser/configure.ac:1.6	Fri Jul 14 23:28:01 2023
+++ src/lib/librumpuser/configure.ac	Sat Jul 15 09:21:36 2023
@@ -13,7 +13,7 @@ AC_INIT([rumpuser-posix], [999], [https:
 
 AC_CONFIG_HEADERS([rumpuser_config.h])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([build-aux])
 
 AC_LANG([C])
 

CVS commit: src/lib/librumpuser

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jul 15 09:21:36 UTC 2023

Modified Files:
src/lib/librumpuser: configure.ac

Log Message:
librumpuser/configure: fix missing directory warning

Use "build-aux" instead of the non-existant "m4" as the
directory for AC_CONFIG_MACRO_DIR.

Avoids autoreconf warning:
  aclocal: warning: couldn't open directory 'm4': No such file or directory

No change to generated files.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/configure.ac

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

CVS commit: src/lib

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri Jul 14 23:28:01 UTC 2023

Modified Files:
src/lib/libpthread: Makefile
src/lib/librumpuser: configure.ac rumpuser_port.h

Log Message:
fix rump URLs

Link to https://github.com/rumpkernel/ instead of
a site now taken over by an SEO squatter.

Per discussion on github.com/rumpkernel issues with pooka.

PR misc/57501


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/lib/libpthread/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/configure.ac
cvs rdiff -u -r1.52 -r1.53 src/lib/librumpuser/rumpuser_port.h

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

Modified files:

Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.96 src/lib/libpthread/Makefile:1.97
--- src/lib/libpthread/Makefile:1.96	Mon Nov 11 22:45:27 2019
+++ src/lib/libpthread/Makefile	Fri Jul 14 23:28:01 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.96 2019/11/11 22:45:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.97 2023/07/14 23:28:01 lukem Exp $
 #
 
 NOSANITIZER=	# defined
@@ -45,7 +45,7 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${.CUR
 
 # providing alternative MI implementations for creating an lwp is
 # possible by setting PTHREAD_MAKELWP.  Currently, alternatives are
-# set by the rumprun software stacks (see repo.rumpkernel.org)
+# set by the rumprun software stacks (see https://github.com/rumpkernel/rumprun )
 PTHREAD_MAKELWP?=	pthread_makelwp_netbsd.c
 
 #

Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.5 src/lib/librumpuser/configure.ac:1.6
--- src/lib/librumpuser/configure.ac:1.5	Thu Mar  5 00:25:39 2015
+++ src/lib/librumpuser/configure.ac	Fri Jul 14 23:28:01 2023
@@ -5,11 +5,11 @@
 #   1) autoreconf -iv
 #   2) edit rumpuser_port.h (search for RUMPUSER_CONFIG for instructions)
 #   3) rm -rf autom4te.cache
-#   4) commit to NetBSD, pullup to repo.rumpkernel.org
+#   4) commit to NetBSD, pullup to https://github.com/rumpkernel/
 #
 
 AC_PREREQ([2.66])
-AC_INIT([rumpuser-posix], [999], [http://rumpkernel.org/])
+AC_INIT([rumpuser-posix], [999], [https://github.com/rumpkernel/])
 
 AC_CONFIG_HEADERS([rumpuser_config.h])
 AC_CONFIG_AUX_DIR([build-aux])

Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.52 src/lib/librumpuser/rumpuser_port.h:1.53
--- src/lib/librumpuser/rumpuser_port.h:1.52	Tue Apr 19 20:32:17 2022
+++ src/lib/librumpuser/rumpuser_port.h	Fri Jul 14 23:28:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.52 2022/04/19 20:32:17 rillig Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.53 2023/07/14 23:28:01 lukem Exp $	*/
 
 #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
 #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
@@ -48,7 +48,7 @@
 #define HAVE_UNISTD_H 1
 #define HAVE_UTIMENSAT 1
 #define HAVE___QUOTACTL 1
-#define PACKAGE_BUGREPORT "http://rumpkernel.org/;
+#define PACKAGE_BUGREPORT "https://github.com/rumpkernel/;
 #define PACKAGE_NAME "rumpuser-posix"
 #define PACKAGE_STRING "rumpuser-posix 999"
 #define PACKAGE_TARNAME "rumpuser-posix"

CVS commit: src/lib

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri Jul 14 23:28:01 UTC 2023

Modified Files:
src/lib/libpthread: Makefile
src/lib/librumpuser: configure.ac rumpuser_port.h

Log Message:
fix rump URLs

Link to https://github.com/rumpkernel/ instead of
a site now taken over by an SEO squatter.

Per discussion on github.com/rumpkernel issues with pooka.

PR misc/57501


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/lib/libpthread/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/configure.ac
cvs rdiff -u -r1.52 -r1.53 src/lib/librumpuser/rumpuser_port.h

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

CVS commit: src/sys/rump/share/man

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri Jul 14 23:21:53 UTC 2023

Modified Files:
src/sys/rump/share/man/man3: rumpuser.3
src/sys/rump/share/man/man7: rumpkernel.7

Log Message:
fix rump URLs in man pages

Link to https://github.com/rumpkernel/wiki/wiki instead of
a site now taken over by an SEO squatter.

Per discussion on github.com/rumpkernel issues
with pooka.

PR misc/57501


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/share/man/man3/rumpuser.3
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/share/man/man7/rumpkernel.7

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

Modified files:

Index: src/sys/rump/share/man/man3/rumpuser.3
diff -u src/sys/rump/share/man/man3/rumpuser.3:1.3 src/sys/rump/share/man/man3/rumpuser.3:1.4
--- src/sys/rump/share/man/man3/rumpuser.3:1.3	Fri Mar  8 08:24:41 2019
+++ src/sys/rump/share/man/man3/rumpuser.3	Fri Jul 14 23:21:53 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: rumpuser.3,v 1.3 2019/03/08 08:24:41 wiz Exp $
+.\" $NetBSD: rumpuser.3,v 1.4 2023/07/14 23:21:53 lukem Exp $
 .\"
 .\" Copyright (c) 2013 Antti Kantee.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 24, 2014
+.Dd July 15, 2023
 .Dt RUMPUSER 3
 .Os
 .Sh NAME
@@ -769,7 +769,7 @@ Routines which do not return an integer 
 For a list of all known implementations of the
 .Nm
 interface, see
-.Lk http://wiki.rumpkernel.org/Platforms .
+.Lk https://github.com/rumpkernel/wiki/wiki/Platforms .
 .Sh HISTORY
 The rump kernel hypercall API was first introduced in
 .Nx 5.0 .

Index: src/sys/rump/share/man/man7/rumpkernel.7
diff -u src/sys/rump/share/man/man7/rumpkernel.7:1.3 src/sys/rump/share/man/man7/rumpkernel.7:1.4
--- src/sys/rump/share/man/man7/rumpkernel.7:1.3	Tue Dec 16 15:33:22 2014
+++ src/sys/rump/share/man/man7/rumpkernel.7	Fri Jul 14 23:21:53 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: rumpkernel.7,v 1.3 2014/12/16 15:33:22 pooka Exp $
+.\" $NetBSD: rumpkernel.7,v 1.4 2023/07/14 23:21:53 lukem Exp $
 .\"
 .\" Copyright (c) 2008-2014 Antti Kantee.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 1, 2014
+.Dd July 15, 2023
 .Dt RUMPKERNEL 7
 .Os
 .Sh NAME
@@ -88,7 +88,7 @@ allocation fails, the rump kernel will a
 available by invoking its internal pagedaemon to flush caches.
 .El
 .Sh SEE ALSO
-.Lk http://rumpkernel.org/
+.Lk https://github.com/rumpkernel/wiki/wiki
 .Rs
 .%A Antti Kantee
 .%A Justin Cormack

CVS commit: src/sys/rump/share/man

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri Jul 14 23:21:53 UTC 2023

Modified Files:
src/sys/rump/share/man/man3: rumpuser.3
src/sys/rump/share/man/man7: rumpkernel.7

Log Message:
fix rump URLs in man pages

Link to https://github.com/rumpkernel/wiki/wiki instead of
a site now taken over by an SEO squatter.

Per discussion on github.com/rumpkernel issues
with pooka.

PR misc/57501


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/share/man/man3/rumpuser.3
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/share/man/man7/rumpkernel.7

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

Re: CVS commit: src/tools/compat

[Luke Mewburn]

On 23-07-08 19:10, Palle Lyckegaard wrote:
  | Module Name:src
  | Committed By:   palle
  | Date:   Sat Jul  8 19:10:00 UTC 2023
  | 
  | Modified Files:
  | src/tools/compat: compat_defs.h
  | 
  | Log Message:
  | Add support for missing NAME_MAX when building on Solaris hosts
  | 

  | 
  | Index: src/tools/compat/compat_defs.h
  | diff -u src/tools/compat/compat_defs.h:1.120 
src/tools/compat/compat_defs.h:1.121
  | --- src/tools/compat/compat_defs.h:1.120Sun May 30 10:39:41 2021
  | +++ src/tools/compat/compat_defs.h  Sat Jul  8 19:10:00 2023
  | @@ -1,4 +1,4 @@
  | -/* $NetBSD: compat_defs.h,v 1.120 2021/05/30 10:39:41 cjep Exp $   */
  | +/* $NetBSD: compat_defs.h,v 1.121 2023/07/08 19:10:00 palle Exp $  */
  |  
  |  #ifndef__NETBSD_COMPAT_DEFS_H__
  |  #define__NETBSD_COMPAT_DEFS_H__
  | @@ -31,6 +31,17 @@
  |  #endif /* __linux__ && HAVE_FEATURES_H */
  |  
  |  /*
  | + * Solaris:
  | + * No NAME_MAX define is available (as documented in the Solaris
  | + * limits.h file), so use the XOPEN defined constant.
  | + */
  | +
  | +#if defined(__sun__)
  | +#define NAME_MAX _XOPEN_NAME_MAX
  | +#endif
  | +

This might be better as a check for NAME_MAX not being defined
and _XOPEN_NAME_MAX being defined?

Something like:
#if !defined(NAME_MAX)
#if defined(_XOPEN_NAME_MAX)
#define NAME_MAX _XOPEN_NAME_MAX
#else
#error "Unable to determine NAME_MAX"
#endif
#endif

There might be an even cleaner idiom.


regards,
Luke.

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul  5 16:41:13 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: wording tweaks


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/BUILDING
cvs rdiff -u -r1.144 -r1.145 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.155 src/BUILDING:1.156
--- src/BUILDING:1.155	Sun Jun 11 20:34:14 2023
+++ src/BUILDING	Wed Jul  5 16:41:12 2023
@@ -93,9 +93,9 @@ FILES
 during the build.
 
Build tree layout
- The NetBSD build tree is described in hier(7) (mdoc(7) source in
+ The NetBSD build tree is described in hier(7) (whose mdoc(7) source is in
  share/man/man7/hier.7), and the release layout is described in release(7)
- (mdoc(7) source in share/man/man7/release.7).
+ (whose mdoc(7) source is in share/man/man7/release.7).
 
 CONFIGURATION
Environment variables
@@ -218,8 +218,8 @@ CONFIGURATION
  Default: "/tmp".
 
"make" variables
- Variables control the behavior of NetBSD builds are documented in
- mk.conf(5) (mdoc(7) source in share/man/man5/mk.conf.5).
+ Variables that control the behavior of NetBSD builds are documented in
+ mk.conf(5) (whose mdoc(7) source is in share/man/man5/mk.conf.5).
 
  Unless otherwise specified, these variables may be set in either the
  process environment or the make(1) configuration file mk.conf(5)
@@ -819,4 +819,4 @@ CAVEATS
  in object directories.  Instead, one may have to manually remove the
  files.  Consult the UPDATING file for notices concerning this.
 
-NetBSD   June 11, 2023  NetBSD
+NetBSD   July 5, 2023   NetBSD

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.144 src/doc/BUILDING.mdoc:1.145
--- src/doc/BUILDING.mdoc:1.144	Sun Jun 11 20:34:14 2023
+++ src/doc/BUILDING.mdoc	Wed Jul  5 16:41:12 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.144 2023/06/11 20:34:14 lukem Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.145 2023/07/05 16:41:12 lukem Exp $
 .\"
 .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd June 11, 2023
+.Dd July 5, 2023
 .Dt BUILDING 8
 .Os NetBSD
 .\" turn off hyphenation
@@ -222,13 +222,15 @@ The
 .Nx
 build tree is described in
 .Xr hier 7
-.Xr ( mdoc 7
-source in
+(whose
+.Xr mdoc 7
+source is in
 .Pa share/man/man7/hier.7 ) ,
 and the release layout is described in
 .Xr release 7
-.Xr ( mdoc 7
-source in
+(whose
+.Xr mdoc 7
+source is in
 .Pa share/man/man7/release.7 ) .
 .
 .Sh CONFIGURATION
@@ -487,12 +489,13 @@ option.
 .
 .Ss \*qmake\*q variables
 .
-Variables control the behavior of
+Variables that control the behavior of
 .Nx
 builds are documented in
 .Xr mk.conf 5
-.Xr ( mdoc 7
-source in
+(whose
+.Xr mdoc 7
+source is in
 .Pa share/man/man5/mk.conf.5 ) .
 .Pp
 Unless otherwise specified, these variables may be set in

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul  5 16:41:13 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: wording tweaks


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/BUILDING
cvs rdiff -u -r1.144 -r1.145 src/doc/BUILDING.mdoc

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul  5 16:40:34 UTC 2023

Modified Files:
src/lib/librumpuser: README.compileopts
src/share/man/man5: mk.conf.5
src/sys/rump: README.compileopts

Log Message:
mk.conf(5): document rump variables

Update mk.conf(5) with the rump variables from
- lib/librumpuser/README.compileopts
- sys/rump/README.compileopts

Add cross-references back to mk.conf(5) in those files.

Ensure that the Default: is listed last in a description,
for consistency with the convention in this file.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/README.compileopts
cvs rdiff -u -r1.105 -r1.106 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/README.compileopts

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

Modified files:

Index: src/lib/librumpuser/README.compileopts
diff -u src/lib/librumpuser/README.compileopts:1.2 src/lib/librumpuser/README.compileopts:1.3
--- src/lib/librumpuser/README.compileopts:1.2	Mon Aug  2 17:45:10 2021
+++ src/lib/librumpuser/README.compileopts	Wed Jul  5 16:40:33 2023
@@ -1,8 +1,11 @@
-$NetBSD: README.compileopts,v 1.2 2021/08/02 17:45:10 andvar Exp $
+$NetBSD: README.compileopts,v 1.3 2023/07/05 16:40:33 lukem Exp $
 
 This file describes compile-time options (make variables) for
 the rumpuser POSIX implementation.
 
+Additionally, NetBSD build options will have an effect; see mk.conf(5)
+and src/share/mk/bsd.README for a description of NetBSD build options.
+
 Note: after changing an option, do a clean build.
 
 Global options:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.105 src/share/man/man5/mk.conf.5:1.106
--- src/share/man/man5/mk.conf.5:1.105	Wed Jun 14 02:28:41 2023
+++ src/share/man/man5/mk.conf.5	Wed Jul  5 16:40:34 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.105 2023/06/14 02:28:41 rin Exp $
+.\"	$NetBSD: mk.conf.5,v 1.106 2023/07/05 16:40:34 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 14, 2023
+.Dd July 5, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -47,7 +47,7 @@ file overrides various parameters used d
 Listed below are the
 .Nm
 variables that may be set that affect the
-.Nx NetBSD
+.Nx
 system build,
 the values to which each may be set,
 a brief description of what each variable does,
@@ -1521,13 +1521,13 @@ Indicates whether the
 .Xr rump 3
 headers, libraries, and programs are to be installed.
 .NOVAR COVERITY_TOP_CONFIG No is defined
-.DFLTy
 .Pp
-.Em Note :
-see also
-.Pa src/sys/rump/README.compileopts
-for variables used during the build of the
-.Xr rump 3 .
+See also
+variables that start with
+.Sy RUMPUSER_
+or
+.Sy RUMP_ .
+.DFLTy
 .
 .It Sy MKSANITIZER
 .YorN
@@ -1644,7 +1644,9 @@ option of
 .Xr ld 1 .
 Keeping non-temporary local symbols
 such as static function names is useful on using DTrace for
-userland libraries and getting a backtrace from a rump kernel
+userland libraries and getting a backtrace from a
+.Xr rumpkernel 7
+kernel
 loading shared libraries.
 .DFLTy
 .
@@ -1919,6 +1921,179 @@ mode with the
 option.
 .DFLTu
 .
+.It Sy RUMPUSER_THREADS
+Defines the threading implementation used by the
+.Xr rumpuser 3
+hypercall implementation.
+Supported values:
+.Bl -tag -width pthread
+.It fiber
+Use a fiber interface, with cooperatively scheduled contexts.
+.It none
+Do not support kernel threads.
+.It pthread
+Use
+.Xr pthread 3
+to implement threads.
+.El
+.DFLT
+.Dq pthread .
+.
+.It Sy RUMP_CURLWP
+Defines how
+.Va curlwp
+is obtained in the
+.Xr rumpkernel 7
+kernel.
+.Va curlwp
+is
+a very frequently accessed thread-local variable, and optimizing
+access has a significant performance impact.
+Note that all options are not available on hosts/machine architectures.
+Supported values:
+.Bl -tag -width hypercall
+.It hypercall
+Use a hypercall to fetch the value.
+.It register
+Use a dedicated register.
+(Implies compiling with
+.Fl ffixed- Ns Ar reg ) .
+.It __thread
+Use the __thread feature to fetch value via
+thread local storage (TLS).
+.El
+.DFLT
+.Dq hypercall .
+.
+.It Sy RUMP_DEBUG
+If defined,
+indicates whether
+.Xr rumpkernel 7
+kernels are built with
+.Fl DDEBUG .
+.DFLTu
+.
+.It Sy RUMP_DIAGNOSTIC
+.YorN
+Indicates whether
+.Xr rumpkernel 7
+kernels are built with
+.Fl DDIAGNOSTIC .
+.DFLTy
+.
+.It Sy RUMP_KTRACE
+.YorN
+Indicates whether
+.Xr rumpkernel 7
+kernels are built with
+.Fl DKTRACE .
+.DFLTy
+.
+.It Sy RUMP_LOCKDEBUG
+If defined,
+indicates whether
+.Xr rumpkernel 7
+kernels are built with
+.Fl DLOCKDEBUG .
+.DFLTu
+.
+.It Sy RUMP_LOCKS_UP
+.YorN
+Indicates whether
+.Xr rumpkernel 7
+kernels are built with
+uniprocess-optimized locking or not.
+.Pp
+If
+.Dq yes ,
+build with 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Jul  5 16:40:34 UTC 2023

Modified Files:
src/lib/librumpuser: README.compileopts
src/share/man/man5: mk.conf.5
src/sys/rump: README.compileopts

Log Message:
mk.conf(5): document rump variables

Update mk.conf(5) with the rump variables from
- lib/librumpuser/README.compileopts
- sys/rump/README.compileopts

Add cross-references back to mk.conf(5) in those files.

Ensure that the Default: is listed last in a description,
for consistency with the convention in this file.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/README.compileopts
cvs rdiff -u -r1.105 -r1.106 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/README.compileopts

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

Re: CVS commit: src/share/man/man5

[Luke Mewburn]

On 23-06-11 15:38, Valery Ushakov wrote:
  | On Sun, Jun 11, 2023 at 22:19:42 +1000, Luke Mewburn wrote:
  | > My goal is to get the mk.conf(5) up to date and correct, and more usable.
  | > I intend to remove the duplication in BUILDING and bsd.README
  | > and refer back to mk.conf(5) to avoid the copypasta, with some updated
  | > boilerplate in BUILDING to describe how to find the referenced manual 
pages
  | > within BUILDING if you're not on an NetBSD system.
  | 
  | That would be very nice, thanks.

I've made some more improvements to mk.conf(5).

I've now removed all the variables in BUILDING that are in mk.conf(5)
and added more cross references to mk.conf(5) from BUILDING,
including instructions how to find the source for the manual page
(because you might be on a non NetBSD-current host) and where the
manual pages are online.

Next stop, cleaning up share/mk/bsd.README ...

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 20:34:14 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: remove duplication from mk.conf(5)

Remove all "make" variables / mk.conf(5) variables already documented
in mk.conf(5).  The duplication was a maintenance headache, as I've
experienced over recent weeks getting the build documentation up to
date.

Add notes clarifying that manual page references are to the NetBSD
manual pages, not to the host manual pages, and how to format from
source, or find online at https://man.netbsd.org.

Add explicit links to the mdoc(7) in-tree source for mk.conf(5),
hier(7), and release(7) because those are directly relevant to the host
build information in BUILDING.

Note: We don't normally need these notes for native documentation,
but BUILDING is intended for users on host systems which might not
be NetBSD(-current).

Add missing defaults.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/BUILDING
cvs rdiff -u -r1.143 -r1.144 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.154 src/BUILDING:1.155
--- src/BUILDING:1.154	Sun Jun 11 10:49:43 2023
+++ src/BUILDING	Sun Jun 11 20:34:14 2023
@@ -16,6 +16,13 @@ REQUIREMENTS
  the NetBSD build process.  (See the Environment variables section below
  if you need to override or manually select your compilers.)
 
+ Note: Within this document, cross-references to manual pages are to the
+ NetBSD manual pages, not the host system manual pages.  The mdoc(7)
+ source to the NetBSD manual pages can be found within the source tree,
+ and these and can be formatted with mandoc(1) or nroff(1) if those are
+ available on the host system.  The NetBSD manual pages are also available
+ at https://man.netbsd.org
+
 FILES
Source tree layout
  BUILDING   This document (in plaintext).  Generated from
@@ -51,8 +58,8 @@ FILES
 destination system, boot media, and release notes.
 
  doc/BUILDING.mdoc
-This document, in -mdoc troff format; the original copy.
-Used to generate BUILDING.
+The source to this document, in mdoc(7) format.  Used to
+generate BUILDING.
 
  external, sys/external
 Sources and build infrastructure for components imported
@@ -86,8 +93,9 @@ FILES
 during the build.
 
Build tree layout
- The NetBSD build tree is described in hier(7), and the release layout is
- described in release(7).
+ The NetBSD build tree is described in hier(7) (mdoc(7) source in
+ share/man/man7/hier.7), and the release layout is described in release(7)
+ (mdoc(7) source in share/man/man7/release.7).
 
 CONFIGURATION
Environment variables
@@ -95,12 +103,24 @@ CONFIGURATION
 
  HOST_CC Path name to C compiler used to create the toolchain.
 
+ Default: "cc".
+
  HOST_CFLAGS Flags passed to the host C compiler.
 
+ Default: "-O".
+
+ HOST_CPPFLAGS   Flags passed to the host C/C++ pre-processor.
+
+ Default: Unset.
+
  HOST_CXXPath name to C++ compiler used to create the toolchain.
 
+ Default: Unset, but defaults to "c++" where required.
+
  HOST_CXXFLAGS   Flags passed to the host C++ compiler.
 
+ Default: Unset.
+
  HOST_SH Path name to a shell available on the host system and
  suitable for use during the build.  The NetBSD build
  system requires a modern Bourne-like shell with POSIX-
@@ -119,22 +139,32 @@ CONFIGURATION
  name, which will be converted to an absolute path by
  searching the PATH.
 
+ Default: "sh".
+
  INSTALLBOOT_UBOOT_PATHS
  A colon-separated list of search paths used by
  installboot(8) to find U-Boot packages.
 
+ Default: Unset.
+
  MACHINE Machine type, e.g., "macppc".
 
+ Default: Unset.
+
  MACHINE_ARCHMachine architecture, e.g., "powerpc".
 
+ Default: Unset.
+
  MAKEPath name to invoke make(1) as.
 
+ Default: "make".
+
  MAKECONFThe name of the make(1) configuration file.  See "make"
  variables and mk.conf(5).
 
  Note: Only settable in the process environment.
 
- Default: "/etc/mk.conf"
+ Default: "/etc/mk.conf".
 
  MAKEFLAGS   Flags to invoke make(1) with.
 
@@ -142,6 +172,9 @@ CONFIGURATION
  the environment, but allows MAKEFLAGS to be set via the
   

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 20:34:14 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: remove duplication from mk.conf(5)

Remove all "make" variables / mk.conf(5) variables already documented
in mk.conf(5).  The duplication was a maintenance headache, as I've
experienced over recent weeks getting the build documentation up to
date.

Add notes clarifying that manual page references are to the NetBSD
manual pages, not to the host manual pages, and how to format from
source, or find online at https://man.netbsd.org.

Add explicit links to the mdoc(7) in-tree source for mk.conf(5),
hier(7), and release(7) because those are directly relevant to the host
build information in BUILDING.

Note: We don't normally need these notes for native documentation,
but BUILDING is intended for users on host systems which might not
be NetBSD(-current).

Add missing defaults.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/BUILDING
cvs rdiff -u -r1.143 -r1.144 src/doc/BUILDING.mdoc

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

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 20:33:46 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): more variables from BUILDING and build.sh

Add more variables from build.sh, BUILDING, and various
Makefile's documentation:
CDEXTRA CONFIGOPTS KERNARCHDIR KERNCONFDIR
KERNOBJDIR KERNSRCDIR LOCALTIME

Default sentences now consistently end with ".".
Consistency tweaks in "otherwise".
Editorial tweaks.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.102 src/share/man/man5/mk.conf.5:1.103
--- src/share/man/man5/mk.conf.5:1.102	Sun Jun 11 10:44:33 2023
+++ src/share/man/man5/mk.conf.5	Sun Jun 11 20:33:46 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.102 2023/06/11 10:44:33 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.103 2023/06/11 20:33:46 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -62,7 +62,7 @@ and the default value of each variable.
 ..
 .de DFLTn
 .DFLT
-.Dq no
+.Dq no .
 ..
 .de DFLTu
 .DFLT
@@ -70,7 +70,7 @@ Unset.
 ..
 .de DFLTy
 .DFLT
-.Dq yes
+.Dq yes .
 ..
 .de NODEF
 .Pp
@@ -107,7 +107,7 @@ The real path to the object directory tr
 .Nx
 source tree.
 .DFLT
-.Dq Pa /usr/obj
+.Dq Pa /usr/obj .
 .
 .It Sy BSDSRCDIR
 The real path to the
@@ -116,14 +116,18 @@ source tree, if
 .Sy NETBSDSRCDIR
 isn't defined.
 .DFLT
-.Dq Pa /usr/src
+.Dq Pa /usr/src .
 .
 .It Sy BUILD
 If defined,
 .Sq "make install"
-checks that the targets in the source directories are up-to-date and
+checks that the
+.Xr make 1
+targets in the source directories are up-to-date and
 re-makes them if they are out of date, instead of blindly trying to install
-out of date or non-existent targets.
+out of date or non-existent
+.Xr make 1
+targets.
 .DFLTu
 .
 .It Sy BUILDID
@@ -177,6 +181,33 @@ documentation of
 .Fl frandom-seed .
 .DFLTu
 .
+.It Sy CDEXTRA
+A space-separated list of files or directories that will be
+added to the CD-ROM image that may be create by the
+.Sy build.sh
+.Dq iso-image
+or
+.Dq iso-image-source
+operations.
+Files will be added to the root of the CD-ROM image,
+whereas directories will be copied recursively.
+If relative paths are specified, they will be converted to
+absolute paths before being used.
+.Em Note :
+If using
+.Sy build.sh ,
+multiple paths may be specified via multiple
+.Fl C
+options, or via a single option whose argument contains multiple
+space-separated paths.
+.DFLTu
+.
+.It Sy CONFIGOPTS
+Additional flags to
+.Xr config 1
+when building kernels.
+.DFLTu
+.
 .It Sy COPTS
 Extra options for the C compiler.
 Should be appended to (e.g.,
@@ -234,11 +265,13 @@ will provide a default of
 .Sy .OBJDIR )
 unless run in
 .Sq expert
-mode.
+mode with the
+.Fl E
+option.
 .DFLT
 Empty string if
 .Sy USETOOLS=yes ;
-unset otherwise.
+otherwise unset.
 .
 .It Sy EXTERNAL_TOOLCHAIN
 If defined, this variable indicates the root directory of
@@ -283,12 +316,25 @@ option of
 .DFLTu
 .
 .It Sy INSTALLWORLDDIR
-Location for the top-level
-.Dq make installworld
+Directory for the top-level
+.Xr make 1
+.Dq installworld
 target to install to.
 If specified, must be an absolute path.
 .DFLT
-.Dq /
+.Dq Pa / .
+.
+.It Sy KERNARCHDIR
+Directory under
+.Sy KERNSRCDIR
+containing the machine dependent kernel sources.
+.DFLT
+.Dq Pa arch/ Ns Sy MACHINE .
+.
+.It Sy KERNCONFDIR
+Directory containing the kernel configuration files.
+.DFLT
+.Dq Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /conf .
 .
 .It Sy KERNEL_DIR Pq No experimental
 .YorN
@@ -321,6 +367,38 @@ The
 option is a work-in-progress, and is highly experimental.
 It is also subject to change without notice.
 .DFLTn
+.
+.It Sy KERNOBJDIR
+Directory for kernel builds.
+For example, the kernel
+.Sy GENERIC
+will be compiled in
+.Sy KERNOBJDIR Ns Pa /GENERIC .
+.DFLT
+.Dq Sy MAKEOBJDIRPREFIX Ns Pa / Ns Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /compile
+if it exists or the
+.Xr make 1
+.Dq obj
+target is being made;
+otherwise
+.Dq Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /compile .
+.
+.It Sy KERNSRCDIR
+Directory at the top of the kernel source.
+.DFLT
+.Dq Sy NETBSDSRCDIR Ns Pa /sys .
+.
+.It Sy LOCALTIME
+The name of the
+.Xr tzfile 5
+timezone file in the directory
+.Pa /usr/share/zoneinfo
+to symbolically link
+.Sy DESTDIR Ns Pa /etc/localtime
+to.
+.DFLT
+.Dq UTC .
+.
 .It Sy MAKEVERBOSE
 Level of verbosity of status messages.
 Supported values:
@@ -356,7 +434,7 @@ are traced through use of the
 flag.
 .El
 .DFLT
-2
+.Sy 2 .
 .
 .It Sy MKAMDGPUFIRMWARE
 .YorN
@@ -365,7 +443,8 @@ Indicates whether to install the
 directory, which is necessary for the
 .Xr amdgpu 4
 AMD RADEON GPU video driver.
-.DFLTy
+.DFLT
+.Dq yes
 on
 .Sy i386
 and
@@ -505,7 +584,8 @@ 

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 20:33:46 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): more variables from BUILDING and build.sh

Add more variables from build.sh, BUILDING, and various
Makefile's documentation:
CDEXTRA CONFIGOPTS KERNARCHDIR KERNCONFDIR
KERNOBJDIR KERNSRCDIR LOCALTIME

Default sentences now consistently end with ".".
Consistency tweaks in "otherwise".
Editorial tweaks.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/share/man/man5/mk.conf.5

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

Re: CVS commit: src/share/man/man5

[Luke Mewburn]

On 23-06-11 14:14, Valery Ushakov wrote:
  | On Sun, Jun 11, 2023 at 10:44:33 +, Luke Mewburn wrote:
  | 
  | > Module Name:  src
  | > Committed By: lukem
  | > Date: Sun Jun 11 10:44:33 UTC 2023
  | > 
  | > Modified Files:
  | >   src/share/man/man5: mk.conf.5
  | > 
  | > Log Message:
  | [...]
  | > Change sub headings to headings; it's easier to read.
  | > (I don't know why mdoc doesn't allow blank lines around .Ss)
  | 
  | I'm not sure what do you mean.  The difference between .Ss and .Sh is
  | only the indent:
  | 
  | 8<[ .Ss ]8<
  |  ...
  |  the system.
  | 
  |NetBSD System Variables
  |  Listed below are the mk.conf variables that may be set that affect the
  |  ...
  | 8<8<
  | 
  | vs.
  | 
  | 8<[ .Sh ]8<
  |  ...
  |  the system.
  | 
  | NetBSD System Variables
  |  Listed below are the mk.conf variables that may be set that affect the
  |  ...
  | 8<8<
  | 
  | Both have a blank line before and no blank line after.

Ahh, you're right, I misspoke. Tired brain when working on the commit.

IMHO, they both suffer from lack of blank line there, where personally I
would prefer the blank line, especially before a list, and especially
for .Ss because its indent is only 2 in from the main paragraph. But I'm
not considering an mdoc change for that any time soon.

Compare:

8<[ old ]8<
DESCRIPTION
 The mk.conf file overrides various parameters used during the build of
 the system.

 Listed below are the mk.conf variables that may be set, the values to
 which each may be set, a brief description of what each variable does,
 and a reference to relevant manual pages.

   NetBSD System variables
 BSDOBJDIR   The real path to the object directory tree for the NetBSD
 source tree.
8<8<

vs using .Sh (for outdenting) and a textual para before:

8<[ new ]8<
DESCRIPTION
 The mk.conf file overrides various parameters used during the build of
 the system.

NETBSD SYSTEM VARIABLES
 Listed below are the mk.conf variables that may be set that affect the
 NetBSD NetBSD system build, the values to which each may be set, a brief
 description of what each variable does, references to relevant manual
 pages, notes (including any interaction with build.sh), and the default
 value of each variable.

 BSDOBJDIR   The real path to the object directory tree for the NetBSD
 source tree.
8<8<

For me, having a para before it and the outdented heading makes the BSDOBJDIR
"pop" more in a quick eyeball scan, plus easier section searching.

YMMV.


My goal is to get the mk.conf(5) up to date and correct, and more usable.
I intend to remove the duplication in BUILDING and bsd.README
and refer back to mk.conf(5) to avoid the copypasta, with some updated
boilerplate in BUILDING to describe how to find the referenced manual pages
within BUILDING if you're not on an NetBSD system.


Luke.

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:49:44 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: update from mk.conf(5). reorder

Sync variable entries from mk.conf(5).

Merge the "make variables for full builds" section into the previous.
Having two separate sections and some entries duplicated was confusing
when searching for variables.


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/BUILDING
cvs rdiff -u -r1.142 -r1.143 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.153 src/BUILDING:1.154
--- src/BUILDING:1.153	Sun Jun 11 10:43:51 2023
+++ src/BUILDING	Sun Jun 11 10:49:43 2023
@@ -232,8 +232,21 @@ CONFIGURATION
 
  Default: Unset.
 
- CPUFLAGSAdditional flags to the compiler/assembler to select CPU
- instruction set options, CPU tuning options, etc.
+ COPTS   Extra options for the C compiler.  Should be appended to
+ (e.g., COPTS+=-g), rather than explicitly set.
+
+ Note: CPUFLAGS, not COPTS, should be used for compiler
+ flags that select CPU-related options.
+
+ Note: CFLAGS should never be set in mk.conf(5).
+
+ CPUFLAGSAdditional options passed to the compiler/assembler to
+ select CPU instruction set options, CPU tuning options,
+ etc.
+
+ Note: Such options should not be specified in COPTS,
+ because some parts of the build process need to override
+ CPU-related compiler options.
 
  Default: Unset.
 
@@ -247,11 +260,11 @@ CONFIGURATION
  The directory must reside on a file system which supports
  long file names and hard links.
 
- Note: build.sh will provide a default of destdir.MACHINE
- (in the top-level .OBJDIR) unless run in `expert' mode.
+ Note: build.sh will provide a default of
+ "destdir.MACHINE" (in the top-level .OBJDIR) unless run
+ in `expert' mode.
 
- Default: Empty string if USETOOLS is "yes"; unset
- otherwise.
+ Default: Empty string if USETOOLS=yes; unset otherwise.
 
  EXTERNAL_TOOLCHAIN
  If defined, this variable indicates the root directory of
@@ -275,6 +288,18 @@ CONFIGURATION
 
  Default: Unset.
 
+ INSTALLBOOT_BOARDS
+ A list of evbarm boards to create bootable images for.
+ If corresponding U-Boot packages are installed, bootable
+ images are created as part of a release.  See the
+ -o board=name option of installboot(8).
+
+ INSTALLWORLDDIR
+ Location for the top-level "make installworld" target to
+ install to.  If specified, must be an absolute path.
+
+ Default: "/"
+
  MAKEVERBOSE Level of verbosity of status messages.  Supported values:
 
  0   No descriptive messages or commands executed by
@@ -359,20 +384,20 @@ CONFIGURATION
 
  Default: "yes"
 
- MKHOSTOBJ   Can be set to "yes" or "no".  If set to "yes", then for
- programs intended to be run on the compile host, the
- name, release, and architecture of the host operating
- system will be suffixed to the name of the object
- directory created by "make obj".  (This allows multiple
- host systems to compile NetBSD for a single target.)  If
- set to "no", then programs built to be run on the compile
- host will use the same object directory names as programs
- built to be run on the target.
+ MKHOSTOBJ   Can be set to "yes" or "no".  If "yes", then for programs
+ intended to be run on the compile host, the name,
+ release, and architecture of the host operating system
+ will be suffixed to the name of the object directory
+ created by "make obj".  (This allows multiple host
+ systems to compile NetBSD for a single target
+ architecture.)  If "no", then programs built to be run on
+ the compile host will use the same object directory names
+ as programs built to be run on the target architecture.
 
  Default: "no"
 
  MKHTML  Can be set to "yes" or "no".  Indicates whether the HTML
-  

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:49:44 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: update from mk.conf(5). reorder

Sync variable entries from mk.conf(5).

Merge the "make variables for full builds" section into the previous.
Having two separate sections and some entries duplicated was confusing
when searching for variables.


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/BUILDING
cvs rdiff -u -r1.142 -r1.143 src/doc/BUILDING.mdoc

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

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:44:33 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): add remaining vars from BUILDING

Add more variables from BUILDING:
INSTALLBOOT_BOARDS INSTALLWORLDDIR NOCLEANDIR
NODISTRIBDIRS NOINCLUDES.

Add build.sh related notes (from BUILDING).

Clarify "target" as "target architecture" where appropriate
(versus a make target where that's obvious from context.)

Move all obsolete and deprecated variables to
new "OBSOLETE VARIABLES" section at the end.

Add some per-variable editorial improvements from BUILDING.

Change sub headings to headings; it's easier to read.
(I don't know why mdoc doesn't allow blank lines around .Ss)


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.101 src/share/man/man5/mk.conf.5:1.102
--- src/share/man/man5/mk.conf.5:1.101	Mon Jun  5 22:35:20 2023
+++ src/share/man/man5/mk.conf.5	Sun Jun 11 10:44:33 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.101 2023/06/05 22:35:20 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.102 2023/06/11 10:44:33 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 5, 2023
+.Dd June 11, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -41,14 +41,20 @@
 The
 .Nm
 file overrides various parameters used during the build of the system.
-.Pp
+.
+.Sh NETBSD SYSTEM VARIABLES
+.
 Listed below are the
 .Nm
-variables that may be set, the values to which each may be set,
-a brief description of what each variable does, and a reference to
-relevant manual pages.
-.
-.Ss NetBSD System variables
+variables that may be set that affect the
+.Nx NetBSD
+system build,
+the values to which each may be set,
+a brief description of what each variable does,
+references to relevant manual pages,
+notes (including any interaction with
+.Sy build.sh ) ,
+and the default value of each variable.
 .
 .de DFLT
 .Pp
@@ -190,12 +196,15 @@ should never be set in
 .Nm .
 .
 .It Sy CPUFLAGS
-Additional flags passed to the compiler/assembler to select
+Additional options passed to the compiler/assembler to select
 CPU instruction set options, CPU tuning options, etc.
+.Pp
+.Em Note :
 Such options should not be specified in
 .Sy COPTS ,
 because some parts of the build process need to override
 CPU-related compiler options.
+.DFLTu
 .
 .It Sy DESTDIR
 Directory to contain the built
@@ -205,13 +214,15 @@ If set, special options are passed to th
 prevent their default use of the host system's
 .Sy /usr/include , /usr/lib ,
 and so forth.
-This pathname should
+This pathname must be an absolute path, and should
 .Em not
 end with a slash
 .Pq /
-character (for installation into the system's root directory, set
+character.
+(For installation into the system's root directory, set
 .Sy DESTDIR
-to an empty string).
+to an empty string, not to
+.Dq / ) .
 The directory must reside on a file system which supports long file
 names and hard links.
 .Pp
@@ -223,7 +234,7 @@ will provide a default of
 .Sy .OBJDIR )
 unless run in
 .Sq expert
-mode
+mode.
 .DFLT
 Empty string if
 .Sy USETOOLS=yes ;
@@ -257,8 +268,27 @@ Expect the exact semantics of this varia
 term as parts of the cross-compile framework continue to be cleaned up.
 .DFLTu
 .
-.It Sy EXTSRCSRCDIR
-Obsolete.
+.It Sy INSTALLBOOT_BOARDS
+A list of
+.Sy evbarm
+boards to create bootable images for.
+If corresponding U-Boot packages are installed,
+bootable images are created as part of a release.
+See the
+.Bk -words
+.Fl o Sy board= Ns Ar name
+.Ek
+option of
+.Xr installboot 8 .
+.DFLTu
+.
+.It Sy INSTALLWORLDDIR
+Location for the top-level
+.Dq make installworld
+target to install to.
+If specified, must be an absolute path.
+.DFLT
+.Dq /
 .
 .It Sy KERNEL_DIR Pq No experimental
 .YorN
@@ -303,17 +333,17 @@ are shown.
 Brief messages are shown describing what is being done,
 but the actual commands executed by
 .Xr make 1
-are not displayed.
+are not shown.
 .It 2
 Descriptive messages are shown as above (prefixed with a
 .Sq # ) ,
 and ordinary commands performed by
 .Xr make 1
-are displayed.
+are shown.
 .It 3
 In addition to the above, all commands performed by
 .Xr make 1
-are displayed, even if they would ordinarily have been hidden
+are shown, even if they would ordinarily have been hidden
 through use of the
 .Dq \&@
 prefix in the relevant makefile.
@@ -371,10 +401,6 @@ as the tests rely on ATF and cannot be b
 .NOVAR MKCXX=no
 .DFLTy
 .
-.It Sy MKBFD
-Obsolete, use
-.Sy MKBINUTILS .
-.
 .It Sy MKBINUTILS
 .YorN
 Indicates whether any of the binutils tools or 

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:44:33 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): add remaining vars from BUILDING

Add more variables from BUILDING:
INSTALLBOOT_BOARDS INSTALLWORLDDIR NOCLEANDIR
NODISTRIBDIRS NOINCLUDES.

Add build.sh related notes (from BUILDING).

Clarify "target" as "target architecture" where appropriate
(versus a make target where that's obvious from context.)

Move all obsolete and deprecated variables to
new "OBSOLETE VARIABLES" section at the end.

Add some per-variable editorial improvements from BUILDING.

Change sub headings to headings; it's easier to read.
(I don't know why mdoc doesn't allow blank lines around .Ss)


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/share/man/man5/mk.conf.5

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:43:51 UTC 2023

Modified Files:
src: BUILDING Makefile
src/doc: BUILDING.mdoc
src/etc: Makefile.params

Log Message:
more NBUILDJOBS deprecation

The NBUILDJOBS option was deprecated in 2002;
there's no need to keep warning about it,
remove from params / show-params,
and only document as obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/BUILDING
cvs rdiff -u -r1.336 -r1.337 src/Makefile
cvs rdiff -u -r1.141 -r1.142 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.22 -r1.23 src/etc/Makefile.params

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.152 src/BUILDING:1.153
--- src/BUILDING:1.152	Mon Jun  5 22:36:17 2023
+++ src/BUILDING	Sun Jun 11 10:43:51 2023
@@ -676,11 +676,6 @@ CONFIGURATION
  If using build.sh, this may be set by giving the -u
  option.
 
- NBUILDJOBS  Now obsolete.  Use the make(1) option -j, instead.  See
- below.
-
- Default: Unset.
-
  NOCLEANDIR  If set, avoids the "make cleandir" phase of a full build.
  This has the effect of allowing only changed files in a
  source tree to be recompiled.  This can speed up builds
@@ -1293,7 +1288,7 @@ EXAMPLES
   the release build.
 
 OBSOLETE VARIABLES
- NBUILDJOBS  Use the make(1) option -j instead.
+ NBUILDJOBS  Use the build.sh and make(1) option -j instead.
 
  USE_NEW_TOOLCHAIN
  The new toolchain is now the default.  To disable, use
@@ -1316,4 +1311,4 @@ CAVEATS
  in object directories.  Instead, one may have to manually remove the
  files.  Consult the UPDATING file for notices concerning this.
 
-NetBSD   June 5, 2023   NetBSD
+NetBSD   June 10, 2023  NetBSD

Index: src/Makefile
diff -u src/Makefile:1.336 src/Makefile:1.337
--- src/Makefile:1.336	Fri Jun  2 20:48:09 2023
+++ src/Makefile	Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.337 2023/06/11 10:43:51 lukem Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -446,9 +446,6 @@ check-tools: .PHONY
 .elif defined(EXTERNAL_TOOLCHAIN)
 	@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
 .endif
-.if defined(NBUILDJOBS)
-	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
-.endif
 
 # Delete or sanitise a leftover METALOG from a previous build.
 clean_METALOG: .PHONY .MAKE

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.141 src/doc/BUILDING.mdoc:1.142
--- src/doc/BUILDING.mdoc:1.141	Mon Jun  5 22:36:17 2023
+++ src/doc/BUILDING.mdoc	Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.141 2023/06/05 22:36:17 lukem Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.142 2023/06/11 10:43:51 lukem Exp $
 .\"
 .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd June 5, 2023
+.Dd June 10, 2023
 .Dt BUILDING 8
 .Os NetBSD
 .\" turn off hyphenation
@@ -1169,16 +1169,6 @@ this may be set by giving the
 .Fl u
 option.
 .
-.It Sy NBUILDJOBS
-Now obsolete.
-Use the
-.Xr make 1
-option
-.Fl j ,
-instead.
-See below.
-.DFLTu
-.
 .It Sy NOCLEANDIR
 If set, avoids the
 .Dq make cleandir
@@ -2432,6 +2422,8 @@ portion of the release build.
 .
 .It Sy NBUILDJOBS
 Use the
+.Nm build.sh
+and
 .Xr make 1
 option
 .Fl j

Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.22 src/etc/Makefile.params:1.23
--- src/etc/Makefile.params:1.22	Sun Feb 14 18:45:44 2021
+++ src/etc/Makefile.params	Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.params,v 1.22 2021/02/14 18:45:44 pgoyette Exp $
+#	$NetBSD: Makefile.params,v 1.23 2023/06/11 10:43:51 lukem Exp $
 #
 # Makefile fragment for printing build parameters.
 #
@@ -50,7 +50,7 @@ RELEASEVARS=	DISTRIBVER EXTERNAL_TOOLCHA
 RELEASEVARS+= 	BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
 		DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR MAKE \
 		KERNEL_DIR MAKECONF MAKEFLAGS MAKEOBJDIR MAKEOBJDIRPREFIX \
-		MAKEVERBOSE NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+		MAKEVERBOSE NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
 		RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
 .endif
 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun 11 10:43:51 UTC 2023

Modified Files:
src: BUILDING Makefile
src/doc: BUILDING.mdoc
src/etc: Makefile.params

Log Message:
more NBUILDJOBS deprecation

The NBUILDJOBS option was deprecated in 2002;
there's no need to keep warning about it,
remove from params / show-params,
and only document as obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/BUILDING
cvs rdiff -u -r1.336 -r1.337 src/Makefile
cvs rdiff -u -r1.141 -r1.142 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.22 -r1.23 src/etc/Makefile.params

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 16:08:41 UTC 2023

Modified Files:
src/distrib/sets: Makefile maketars
src/share/mk: bsd.own.mk

Log Message:
sets: enhance MAKEVERBOSE support

Add more messages for various sets operations.
Add ${_MKMSG_CREATE} to bsd.own.mk.

Enhance maketars to be a bit more verbose even with -q,
to make it more obvious why certain operations may be slow.
May help debugging PR 47562.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/Makefile
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/maketars
cvs rdiff -u -r1.1341 -r1.1342 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.108 src/distrib/sets/Makefile:1.109
--- src/distrib/sets/Makefile:1.108	Sun Aug 21 07:10:03 2022
+++ src/distrib/sets/Makefile	Sat Jun 10 16:08:41 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.108 2022/08/21 07:10:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.109 2023/06/10 16:08:41 lukem Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -136,6 +136,7 @@ clean_METALOG: .PHONY
 METALOG.unpriv= -M ${METALOG}.sanitised
 sanitise_METALOG: .PHONY ${METALOG}.sanitised
 ${METALOG}.sanitised: ${METALOG}
+	${_MKMSG_CREATE} METALOG.sanitised
 	<${METALOG} \
 	${${MKUPDATE} != "no" :? ${METALOG_REMOVE_DUPLICATES} | :} \
 	sort | ${TOOL_MTREE} -CSM -k all -R time -N ${NETBSDSRCDIR}/etc \
@@ -170,13 +171,16 @@ clean_METALOG: .PHONY ${METALOG}.sanitis
 
 # This target has debugging value only, really.
 makeflist: .PHONY .PRECIOUS check_DESTDIR
+	${_MKMSG_EXECUTE} "makeflist"
 	${SETSCMD} ./makeflist ${MAKEFLIST_FLAGS}
 
 checkflist: .PRECIOUS .PHONY check_DESTDIR sanitise_METALOG
+	${_MKMSG_EXECUTE} "checkflist"
 	${SETSCMD} ${.CURDIR}/checkflist \
 	${MAKEFLIST_FLAGS} ${CHECKFLIST_FLAGS} ${METALOG.unpriv}
 
 checkflist-x11: .PHONY check_DESTDIR
+	${_MKMSG_EXECUTE} "checkflist -x"
 	${SETSCMD} ./checkflist -x ${CHECKFLIST_FLAGS}
 
 .if defined(DESTDIR) && ${DESTDIR} != ""
@@ -214,7 +218,7 @@ maketars: .PRECIOUS .PHONY check_DESTDIR
 
 maketarsetup: .EXEC
 .if defined(DESTDIR) && ${DESTDIR} != ""
-	${_MKMSG} "execute  checkflist"
+	${_MKMSG_EXECUTE} "checkflist"
 	cd ${.CURDIR}; ${MAKE} checkflist
 .endif
 	mkdir -p ${TARDIR}
@@ -268,6 +272,7 @@ installsets: .PHONY check_DESTDIR saniti
 	@echo "setenv INSTALLDIR before doing that!"
 	@false
 .endif
+	${_MKMSG_EXECUTE} "maketars for installsets"
 	${SETSCMD} ./maketars -d ${DESTDIR:S,^$,/,} ${MAKETARS_FLAGS} \
 	${METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \
 	${MAKEFLIST_FLAGS} -i ${INSTALLDIR} ${INSTALLSETS}
@@ -292,6 +297,7 @@ REGPKG.update:= ${MKUPDATE:tl:Nno:C/..*/
 SYSPKGSETS?= all
 makesyspkgs: .PHONY check_DESTDIR check_RELEASEDIR \
 		sanitise_METALOG checkflist_if_DESTDIR
+	${_MKMSG_EXECUTE} "regpkgset for makesyspkgs"
 	mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 	${SETSCMD} ${.CURDIR}/regpkgset \
 	${REGPKG.verbose} ${REGPKG.force} ${REGPKG.sloppy} \
@@ -301,12 +307,14 @@ makesyspkgs: .PHONY check_DESTDIR check_
 	-t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs ${SYSPKGSETS}
 
 makesyspkgsums: .PHONY check_RELEASEDIR
+	${_MKMSG_CREATE} "syspkgs checksums"
 	${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 
 # Update the "deps" file.
 # XXX: Why is "deps" checked in to the source tree, instead of
 # just being created as necessary?
 makedeps: .PHONY
+	${_MKMSG_CREATE} "syspkgs checksums"
 	${SETSCMD} ./syspkgdeps all >${.CURDIR}/deps
 
 # Sort the lists files.

Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.95 src/distrib/sets/maketars:1.96
--- src/distrib/sets/maketars:1.95	Sat Jun 10 14:11:08 2023
+++ src/distrib/sets/maketars	Sat Jun 10 16:08:41 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.95 2023/06/10 14:11:08 lukem Exp $
+# $NetBSD: maketars,v 1.96 2023/06/10 16:08:41 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -173,6 +173,7 @@ trap cleanup 0 2 3 13		# EXIT INT QUIT P
 #
 
 for setname in ${lists}; do
+	msg "Creating flist.${setname}"
 	${HOST_SH} "${setsdir}/makeflist" -a "${MACHINE_ARCH}" -m "${MACHINE}" \
 	-s "${setsdir}" "${setname}" > "${SDIR}/flist.${setname}" \
 	|| exit 1
@@ -180,7 +181,7 @@ for setname in ${lists}; do
 		echo >&2 "makeflist output is empty for ${setname}"
 		exit 1
 	fi
-	${setfilesonly} && msg "Creating ${setlistdir}/set.${setname}"
+	msg "Creating set.${setname}"
 	if [ -n "${metalog}" ]; then
 		${AWK} -f "${rundir}/getdirs.awk" "${SDIR}/flist.${setname}" \
 		> "${SDIR}/flist.${setname}.full" \

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1341 src/share/mk/bsd.own.mk:1.1342
--- src/share/mk/bsd.own.mk:1.1341	Sat Jun  3 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 16:08:41 UTC 2023

Modified Files:
src/distrib/sets: Makefile maketars
src/share/mk: bsd.own.mk

Log Message:
sets: enhance MAKEVERBOSE support

Add more messages for various sets operations.
Add ${_MKMSG_CREATE} to bsd.own.mk.

Enhance maketars to be a bit more verbose even with -q,
to make it more obvious why certain operations may be slow.
May help debugging PR 47562.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/Makefile
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/maketars
cvs rdiff -u -r1.1341 -r1.1342 src/share/mk/bsd.own.mk

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

CVS commit: src/distrib/sets

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 14:11:08 UTC 2023

Modified Files:
src/distrib/sets: maketars

Log Message:
maketars: add comments for skipped mtree keywords

Reorder skipkeys alphabetically and add comment explaining
the purpose and why sha256 is not part of the variable.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/maketars

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

CVS commit: src/distrib/sets

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 14:11:08 UTC 2023

Modified Files:
src/distrib/sets: maketars

Log Message:
maketars: add comments for skipped mtree keywords

Reorder skipkeys alphabetically and add comment explaining
the purpose and why sha256 is not part of the variable.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/maketars

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

Modified files:

Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.94 src/distrib/sets/maketars:1.95
--- src/distrib/sets/maketars:1.94	Sun Aug 21 07:10:03 2022
+++ src/distrib/sets/maketars	Sat Jun 10 14:11:08 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.94 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: maketars,v 1.95 2023/06/10 14:11:08 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -30,9 +30,12 @@ setlistdir=
 timestamp=
 setfilesonly=false
 quiet=false
-skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum
 preserve="-pe"
 
+# mtree(8) keys to skip (exclude) in the generated /etc/mtree/sets.* files.
+# Note: sets contain sha256 so that keyword is not listed here.
+skipkeys=cksum,md5,rmd160,sha1,sha384,sha512,time
+
 usage()
 {
 	cat 1>&2 <

CVS commit: src/doc

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 13:16:44 UTC 2023

Modified Files:
src/doc: 3RDPARTY

Log Message:
3RDPARTY: libarchive latest is 3.6.2. note local fixes


To generate a diff of this commit:
cvs rdiff -u -r1.1929 -r1.1930 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1929 src/doc/3RDPARTY:1.1930
--- src/doc/3RDPARTY:1.1929	Thu Jun  1 01:09:51 2023
+++ src/doc/3RDPARTY	Sat Jun 10 13:16:44 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1929 2023/06/01 01:09:51 gutteridge Exp $
+#	$NetBSD: 3RDPARTY,v 1.1930 2023/06/10 13:16:44 lukem Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -713,7 +713,7 @@ Talk to mrg before importing any new ver
 
 Package:	libarchive
 Version:	3.4.0
-Current Vers:	3.6.1
+Current Vers:	3.6.2
 Maintainer:	kient...@freebsd.org, jo...@netbsd.org
 Archive Site:	https://github.com/libarchive/libarchive/releases
 Home Page: 	http://www.libarchive.org
@@ -723,6 +723,7 @@ License:	BSD (2-clause)
 Location:	external/bsd/libarchive/dist
 Notes:
 Distribution is stripped down to the relevant part.
+Local fix for PR bin/56080 sent back to upstream.
 
 Package:	libdevmapper
 Version:	1.02.40

CVS commit: src/doc

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 13:16:44 UTC 2023

Modified Files:
src/doc: 3RDPARTY

Log Message:
3RDPARTY: libarchive latest is 3.6.2. note local fixes


To generate a diff of this commit:
cvs rdiff -u -r1.1929 -r1.1930 src/doc/3RDPARTY

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

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 12:46:32 UTC 2023

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read_disk_posix.c

Log Message:
libarchive: fail if name_max is 0

Add error handling to the USE_READDIR_R code paths that set name_max
from struct statfs or statvfs; if the determined name_max == 0
then return an error.

Avoids a crash in tree_dir_next_posix() when the calculation of
dirent_size from name_max is too small for the memory allocated
for struct dirent.

Submitted to upstream in pull request
https://github.com/libarchive/libarchive/pull/1903

Should fix PR bin/56080


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c

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

Modified files:

Index: src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.2 src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.3
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.2	Mon Mar 29 15:31:46 2021
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c	Sat Jun 10 12:46:32 2023
@@ -1653,6 +1653,11 @@ setup_current_filesystem(struct archive_
 	else
 		t->current_filesystem->name_max = nm;
 #endif
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+		"Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif /* USE_READDIR_R */
 	return (ARCHIVE_OK);
 }
@@ -1726,6 +1731,11 @@ setup_current_filesystem(struct archive_
 
 	/* Set maximum filename length. */
 	t->current_filesystem->name_max = sfs.f_namemax;
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+		"Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 	return (ARCHIVE_OK);
 }
 
@@ -1858,6 +1868,11 @@ setup_current_filesystem(struct archive_
 #if defined(USE_READDIR_R)
 	/* Set maximum filename length. */
 	t->current_filesystem->name_max = sfs.f_namelen;
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+		"Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif
 	return (ARCHIVE_OK);
 }
@@ -1939,6 +1954,11 @@ setup_current_filesystem(struct archive_
 #if defined(USE_READDIR_R)
 	/* Set maximum filename length. */
 	t->current_filesystem->name_max = sfs.f_namemax;
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+		"Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif
 	return (ARCHIVE_OK);
 }
@@ -1993,6 +2013,11 @@ setup_current_filesystem(struct archive_
 	else
 		t->current_filesystem->name_max = nm;
 #  endif /* _PC_NAME_MAX */
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(>archive, ARCHIVE_ERRNO_MISC,
+		"Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif /* USE_READDIR_R */
 	return (ARCHIVE_OK);
 }

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun 10 12:46:32 UTC 2023

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read_disk_posix.c

Log Message:
libarchive: fail if name_max is 0

Add error handling to the USE_READDIR_R code paths that set name_max
from struct statfs or statvfs; if the determined name_max == 0
then return an error.

Avoids a crash in tree_dir_next_posix() when the calculation of
dirent_size from name_max is too small for the memory allocated
for struct dirent.

Submitted to upstream in pull request
https://github.com/libarchive/libarchive/pull/1903

Should fix PR bin/56080


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c

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

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:36:59 UTC 2023

Modified Files:
src/share/mk: bsd.README

Log Message:
bsd.README: update to reality, sync from mk.conf(5)

Sync user variables from mk.conf(5), sorted.
(Arguably this could just refer to mk.conf(5)
or share/man/man5/mk.conf.5 and remove the copypasta.)

Document NOxxx overrides in own subsection.

Unexpand tabs, tweak after.


To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/share/mk/bsd.README

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.443 src/share/mk/bsd.README:1.444
--- src/share/mk/bsd.README:1.443	Wed May 24 10:07:16 2023
+++ src/share/mk/bsd.README	Mon Jun  5 22:36:58 2023
@@ -1,11 +1,14 @@
-#	$NetBSD: bsd.README,v 1.443 2023/05/24 10:07:16 lukem Exp $
+#	$NetBSD: bsd.README,v 1.444 2023/06/05 22:36:58 lukem Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
 source tree.  The files are installed in /usr/share/mk, and are,
 by convention, named with the suffix ".mk".
 
-Note, this file is not intended to replace reading through the .mk
+Other sources of relevant documentation are BUILDING in the top
+level of the NetBSD source tree, and the mk.conf(5) man page.
+
+Note: this file is not intended to replace reading through the .mk
 files for anything tricky.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -66,32 +69,35 @@ and are tested with  ${VAR} == "no"  and
 
 The basic rule for the variable naming scheme is as follows:
 
-HOST_xxx	A command that runs on the host machine regardless of
+HOST_	A command that runs on the host machine regardless of
 		whether or not the system is being cross compiled, or
 		flags for such a command.
 
-MKxxx		Can be set to "no" to disable functionality, or
-		"yes" to enable it.
+MK	Can be set to "no" to disable feature ,
+		or "yes" to enable feature .
 		Usually defaults to "yes", although some variables
 		default to "no".
 		Due to make(1) implementation issues, if a temporary
 		command-line override of a mk.conf(5) or 
 		setting is required whilst still honoring a particular
-		Makefile's setting of MKxxx, use
-			env MKxxx=value make
+		Makefile's setting of MK, use
+			env MK=value make
 		instead of
-			make MKxxx=value
+			make MK=value
 
-NOxxx		If defined, disables a feature.
+NO	If defined, disables feature , overriding
+		a user's MK=yes configuration.
 		Not intended for users.
 		This is to allow Makefiles to disable functionality
 		that they don't support (such as missing man pages).
-		NOxxx variables must be defined before 
-		is included.
+		NO variables must be defined before 
+		is included, which generally means define before
+		any <*.mk> is included.
+		See "Variables for a Makefile".
 
-TOOL_xxx	A tool that is provided as part of the USETOOLS
+TOOL_	A tool that is provided as part of the USETOOLS
 		framework.  When not using the USETOOLS framework,
-		TOOL_xxx variables should refer to tools that are
+		TOOL_ variables should refer to tools that are
 		already installed on the host system.
 
 The following variables control how things are made/installed that
@@ -99,530 +105,1094 @@ are not set by default. These should not
 the user to define in MAKECONF (see , below, or mk.conf(5))
 or on the make(1) command line:
 
-BUILD 		If defined, 'make install' checks that the targets in the
-		source directories are up-to-date and remakes them if they
-are out of date, instead of blindly trying to install
-out of date or non-existent targets.
+BUILD		If defined, 'make install' checks that the targets in the
+		source directories are up-to-date and re-makes them if
+		they are out of date, instead of blindly trying to
+		install out of date or non-existent targets.
+
+		Default: Unset.
+
+BUILDID		Identifier for the build.  If set, this should be a short
+		string that is suitable for use as part of a file or
+		directory name.  The identifier will be appended to
+		object directory names, and can be consulted in the
+		make(1) configuration file in order to set additional
+		build parameters, such as compiler flags.  It will also
+		be used as part of the kernel version string, which can
+		be shown by "uname -v".
+
+		Default: Unset.
+
+BUILDINFO	Optional multi-line string containing information about
+		the build.  This will appear in DESTDIR/etc/release, and
+		it will be stored in the buildinfo variable in any
+		kernels that are built.  When such kernels are booted,
+		the sysctl(7) kern.buildinfo variable will report this
+		value.  The string may contain backslash escape
+		sequences, such as "\\" (representing a backslash
+		character) and "\n" (representing a newline).
+
+		Default: Unset.
+
+BUILDSEED	g++(1) uses random numbers when compiling 

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:36:59 UTC 2023

Modified Files:
src/share/mk: bsd.README

Log Message:
bsd.README: update to reality, sync from mk.conf(5)

Sync user variables from mk.conf(5), sorted.
(Arguably this could just refer to mk.conf(5)
or share/man/man5/mk.conf.5 and remove the copypasta.)

Document NOxxx overrides in own subsection.

Unexpand tabs, tweak after.


To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/share/mk/bsd.README

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:36:17 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: editorial

MKX11=yes wants MKINET6=yes

Change the width of the variable lists to 14n (from 15n)
so that when the lists are rendered and then left aligned,
the column is 16 characters (aka 2 tabs) which makes
copypasta to bsd.README easier.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/BUILDING
cvs rdiff -u -r1.140 -r1.141 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.151 src/BUILDING:1.152
--- src/BUILDING:1.151	Sun Jun  4 20:08:21 2023
+++ src/BUILDING	Mon Jun  5 22:36:17 2023
@@ -93,93 +93,92 @@ CONFIGURATION
Environment variables
  Several environment variables control the behaviour of NetBSD builds.
 
- HOST_CC  Path name to C compiler used to create the toolchain.
+ HOST_CC Path name to C compiler used to create the toolchain.
 
- HOST_CFLAGS  Flags passed to the host C compiler.
+ HOST_CFLAGS Flags passed to the host C compiler.
 
- HOST_CXX Path name to C++ compiler used to create the toolchain.
+ HOST_CXXPath name to C++ compiler used to create the toolchain.
 
- HOST_CXXFLAGSFlags passed to the host C++ compiler.
+ HOST_CXXFLAGS   Flags passed to the host C++ compiler.
 
- HOST_SH  Path name to a shell available on the host system and
-  suitable for use during the build.  The NetBSD build
-  system requires a modern Bourne-like shell with POSIX-
-  compliant features, and also requires support for the
-  "local" keyword to declare local variables in shell
-  functions (which is a widely-implemented but non-
-  standardised feature).
-
-  Depending on the host system, a suitable shell may be
-  /bin/sh, /usr/xpg4/bin/sh, /bin/ksh (provided it is a
-  variant of ksh that supports the "local" keyword, such
-  as ksh88, but not ksh93), or /usr/local/bin/bash.
-
-  Most parts of the build require HOST_SH to be an
-  absolute path; however, build.sh allows it to be a
-  simple command name, which will be converted to an
-  absolute path by searching the PATH.
+ HOST_SH Path name to a shell available on the host system and
+ suitable for use during the build.  The NetBSD build
+ system requires a modern Bourne-like shell with POSIX-
+ compliant features, and also requires support for the
+ "local" keyword to declare local variables in shell
+ functions (which is a widely-implemented but non-
+ standardised feature).
+
+ Depending on the host system, a suitable shell may be
+ /bin/sh, /usr/xpg4/bin/sh, /bin/ksh (provided it is a
+ variant of ksh that supports the "local" keyword, such as
+ ksh88, but not ksh93), or /usr/local/bin/bash.
+
+ Most parts of the build require HOST_SH to be an absolute
+ path; however, build.sh allows it to be a simple command
+ name, which will be converted to an absolute path by
+ searching the PATH.
 
  INSTALLBOOT_UBOOT_PATHS
-  A colon-separated list of search paths used by
-  installboot(8) to find U-Boot packages.
+ A colon-separated list of search paths used by
+ installboot(8) to find U-Boot packages.
 
- MACHINE  Machine type, e.g., "macppc".
+ MACHINE Machine type, e.g., "macppc".
 
- MACHINE_ARCH Machine architecture, e.g., "powerpc".
+ MACHINE_ARCHMachine architecture, e.g., "powerpc".
 
- MAKE Path name to invoke make(1) as.
+ MAKEPath name to invoke make(1) as.
 
- MAKECONF The name of the make(1) configuration file.  See "make"
-  variables and mk.conf(5).
+ MAKECONFThe name of the make(1) configuration file.  See "make"
+ variables and mk.conf(5).
 
-  Note: Only settable in the process environment.
+ Note: Only settable in the process environment.
 
-  Default: "/etc/mk.conf"
+ Default: "/etc/mk.conf"
 
- MAKEFLAGSFlags to invoke make(1) with.
+ MAKEFLAGS   Flags to invoke make(1) with.
 
-  Note: build.sh ignores the 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:36:17 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: editorial

MKX11=yes wants MKINET6=yes

Change the width of the variable lists to 14n (from 15n)
so that when the lists are rendered and then left aligned,
the column is 16 characters (aka 2 tabs) which makes
copypasta to bsd.README easier.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/BUILDING
cvs rdiff -u -r1.140 -r1.141 src/doc/BUILDING.mdoc

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

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:35:20 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): editorial

MKDTB and MKPIE are .YorN.
MKX11=yes wants MKINET6=yes.
MKLINKLIB deserves a dash list (like bsd.README).

Expand per bsd.README: MKSTATICPIC, MKUNPRIVED,
MKX11, MKZFS, USE_LIBCSANITIZER, USE_SSP

Change the width of the variable lists to 14n (from 15n)
so that when the lists are rendered and then left aligned,
the column is 16 characters (aka 2 tabs) which makes
copypasta to bsd.README easier.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.100 src/share/man/man5/mk.conf.5:1.101
--- src/share/man/man5/mk.conf.5:1.100	Sun Jun  4 20:04:52 2023
+++ src/share/man/man5/mk.conf.5	Mon Jun  5 22:35:20 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.100 2023/06/04 20:04:52 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.101 2023/06/05 22:35:20 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 4, 2023
+.Dd June 5, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -92,7 +92,7 @@ or
 .Dq no .
 ..
 .
-.Bl -tag -width 15n
+.Bl -tag -width 14n
 .
 .\" These entries are sorted alphabetically.
 .
@@ -644,6 +644,7 @@ will be installed.
 .DFLTy
 .
 .It Sy MKDTB
+.YorN
 Indicates whether the devicetree blobs will be built and installed.
 .DFLTy
 on
@@ -843,6 +844,13 @@ Has no effect on most platforms.
 .YorN
 Indicates whether INET6 (IPv6) infrastructure
 (libraries and support programs) will be built and installed.
+.Pp
+.Em Note :
+.Sy MKINET6
+must not be set to
+.Dq no
+if
+.Sy MKX11!=no .
 .DFLTy
 .
 .It Sy MKINFO
@@ -954,22 +962,32 @@ Indicates if libstdc++ will be built and
 .YorN
 Indicates whether all of the shared library infrastructure
 will be built and installed.
+.Pp
 If
 .Dq no ,
 prevents:
+.Bl -dash -compact
+.It
 installation of the
 .Sy *.a
-libraries,
+libraries
+.It
 installation of the
 .Sy *_pic.a
-libraries on PIC systems,
+libraries on PIC systems
+.It
 building of
 .Sy *.a
-libraries on PIC systems,
-or
+libraries on PIC systems
+.It
 installation of
 .Sy .so
-symlinks on ELF systems.
+symlinks on ELF systems
+.El
+.Pp
+I.e, only install the shared library (and the
+.Pa .so.major
+symlink on ELF).
 .NODEF NOLINKLIB
 .Pp
 If
@@ -1244,6 +1262,7 @@ on
 on other platforms.
 .
 .It Sy MKPIE
+.YorN
 Indicates whether Position Independent Executables (PIE)
 will be built and installed.
 .NODEF NOPIE
@@ -1448,6 +1467,8 @@ will be built and installed.
 .YorN
 Indicates whether support for static PIE binaries
 will be built and installed.
+These binaries use a special support in crt0.o for
+resolving relative relocations and require linker support.
 .DFLTy
 on
 .Sy i386
@@ -1528,6 +1549,8 @@ The contents of
 .Pa METALOG
 is used during the generation of the distribution tar files to ensure
 that the appropriate file ownership is stored.
+This allows a non-root
+.Sq "make install" .
 .DFLTn
 .
 .It Sy MKUPDATE
@@ -1541,7 +1564,14 @@ phase if the destination files are up-to
 .It Sy MKX11
 .YorN
 Indicates whether X11 will be built and installed from
-.Sy X11SRCDIR .
+.Sy X11SRCDIR ,
+and whether the X sets will be created.
+.Pp
+.Em Note :
+If
+.Dq yes ,
+requires
+.Sy MKINET6=yes .
 .DFLTn
 .
 .It Sy MKX11FONTS
@@ -1549,6 +1579,7 @@ Indicates whether X11 will be built and 
 If
 .Dq no ,
 do not build and install the X fonts.
+The xfont set is still created but will be empty.
 .Pp
 Only used if
 .Sy MKX11=yes .
@@ -1616,6 +1647,9 @@ Indicates whether the YP (NIS) infrastru
 .YorN
 Indicates whether the ZFS kernel module and the utilities and
 libraries used to manage the ZFS system are to be built and installed.
+.Pp
+.Em Note :
+ZFS requires 64-bit atomic operations .
 .DFLTy
 on
 .Sy aarch64 ,
@@ -1823,9 +1857,17 @@ Supported values:
 .Bl -tag -width undefined
 .It undefined
 Enables the micro-UBSan in the user mode (uUBSan)
-undefined behaviour sanitizer, with
+undefined behaviour sanitizer.
+The code is shared with the kernel mode variation (kUBSan).
+The runtime runtime differs from the UBSan available in
+.Sy MKSANITIZER .
+The runtime is stripped down from C++ features,
+and is invoked with
 .Li -fsanitize=no-vptr
 as that sanitizer is not supported.
+The runtime configuration is restricted to the
+.Ev LIBC_UBSAN
+environment variable, that is designed to be safe for hardening.
 .El
 .Pp
 The value of
@@ -1912,7 +1954,8 @@ This is mutually exclusive to
 Indicates whether GCC stack-smashing protection (SSP) support,
 which detects stack overflows and aborts the program,
 is enabled.
-This 

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Jun  5 22:35:20 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): editorial

MKDTB and MKPIE are .YorN.
MKX11=yes wants MKINET6=yes.
MKLINKLIB deserves a dash list (like bsd.README).

Expand per bsd.README: MKSTATICPIC, MKUNPRIVED,
MKX11, MKZFS, USE_LIBCSANITIZER, USE_SSP

Change the width of the variable lists to 14n (from 15n)
so that when the lists are rendered and then left aligned,
the column is 16 characters (aka 2 tabs) which makes
copypasta to bsd.README easier.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/share/man/man5/mk.conf.5

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 20:08:22 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: update from canonical mk.conf(5)

Incorporate content and styles updates for mk.conf entries
from share/man/man5/mk.conf.5, which is the canonical
reference for mk.conf.

Add: BSDOBJDIR, BSDSRCDIR, EXTERNAL_TOOLCHAIN, MKDEBUGKERNEL,
MKDEBUGTOOLS, MKHTML, MKLINKLIB, MKOBJDIRS, TOOLCHAIN_MISSING,
NETBSDSRCDIR

It's for further study as to whether we just replace the
most of subsection "make" variables with a link to mk.conf(5).

Style:
- Add more .de macros per mk.conf.5.
- Order list items alphabetically. When multiple items are present
  in a list item, sort within the item first.
- More cross-references.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/BUILDING
cvs rdiff -u -r1.139 -r1.140 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.150 src/BUILDING:1.151
--- src/BUILDING:1.150	Fri Jun  2 20:48:41 2023
+++ src/BUILDING	Sun Jun  4 20:08:21 2023
@@ -18,14 +18,8 @@ REQUIREMENTS
 
 FILES
Source tree layout
- doc/BUILDING.mdoc
-This document (in -mdoc troff format; the original copy).
-
- BUILDING   This document (in plaintext).
-
- tools/compat/README
-Special notes for cross-hosting a NetBSD build on non-
-NetBSD platforms.
+ BUILDING   This document (in plaintext).  Generated from
+doc/BUILDING.mdoc.
 
  Makefile   The main Makefile for NetBSD; should only be run for
 native builds with an appropriately up-to-date version of
@@ -51,18 +45,26 @@ FILES
 Makefile semantics when building these programs for a
 native host.
 
+ distrib/, etc/
+Sources for items used when making a full release
+snapshot, such as files installed in DESTDIR/etc on the
+destination system, boot media, and release notes.
+
+ doc/BUILDING.mdoc
+This document, in -mdoc troff format; the original copy.
+Used to generate BUILDING.
+
  external, sys/external
 Sources and build infrastructure for components imported
 (mostly) unchanged from upstream maintainers, sorted by
 applicable license.  This is (slowly) replacing the
 crypto/dist, dist, and gnu/dist directories.
 
- distrib/, etc/
-Sources for items used when making a full release
-snapshot, such as files installed in DESTDIR/etc on the
-destination system, boot media, and release notes.
+ external/mit/xorg/
+"Reachover" build structure for modular Xorg; the source
+is in X11SRCDIR.
 
- tests/, regress/
+ regress/, tests/
 Regression test harness.  Can be cross-compiled, but only
 run natively.  tests/ uses the atf(7) test framework;
 regress/ contains older tests that have not yet been
@@ -74,15 +76,15 @@ FILES
 This has a special method of determining out-of-date
 status.
 
- bin/ ... usr.sbin/
+ tools/compat/README
+Special notes for cross-hosting a NetBSD build on non-
+NetBSD platforms.
+
+ Other directories including bin/ ... usr.sbin/
 Sources to the NetBSD userland (non-kernel) programs.  If
 any of these directories are missing, they will be skipped
 during the build.
 
- external/mit/xorg/
-"Reachover" build structure for modular Xorg; the source
-is in X11SRCDIR.
-
Build tree layout
  The NetBSD build tree is described in hier(7), and the release layout is
  described in release(7).
@@ -91,393 +93,555 @@ CONFIGURATION
Environment variables
  Several environment variables control the behaviour of NetBSD builds.
 
- HOST_SH   Path name to a shell available on the host system and
-   suitable for use during the build.  The NetBSD build
-   system requires a modern Bourne-like shell with POSIX-
-   compliant features, and also requires support for the
-   "local" keyword to declare local variables in shell
-   functions (which is a widely-implemented but non-
-   standardised feature).
-
-   Depending on the host system, a suitable shell may be
-   /bin/sh, /usr/xpg4/bin/sh, /bin/ksh (provided it is a
-  

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 20:08:22 UTC 2023

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc

Log Message:
BUILDING: update from canonical mk.conf(5)

Incorporate content and styles updates for mk.conf entries
from share/man/man5/mk.conf.5, which is the canonical
reference for mk.conf.

Add: BSDOBJDIR, BSDSRCDIR, EXTERNAL_TOOLCHAIN, MKDEBUGKERNEL,
MKDEBUGTOOLS, MKHTML, MKLINKLIB, MKOBJDIRS, TOOLCHAIN_MISSING,
NETBSDSRCDIR

It's for further study as to whether we just replace the
most of subsection "make" variables with a link to mk.conf(5).

Style:
- Add more .de macros per mk.conf.5.
- Order list items alphabetically. When multiple items are present
  in a list item, sort within the item first.
- More cross-references.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/BUILDING
cvs rdiff -u -r1.139 -r1.140 src/doc/BUILDING.mdoc

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

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 20:04:52 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): add more from BUILDING and bsd.README

Add from BUILDING or bsd.README:
BUILDINFO, BUILDSEED, EXTERNAL_TOOLCHAIN, MKCROSSGDB,
MKREPRO_TIMESTAMP, TOOLCHAIN_MISSING, X11SRCDIR

Clarify BUILDID.
Improve MKDEBUG, MKOBJ, MKX11, NETBSDSRCDIR, USETOOLS,
Consistent Note: formatting.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.99 src/share/man/man5/mk.conf.5:1.100
--- src/share/man/man5/mk.conf.5:1.99	Sat Jun  3 11:13:40 2023
+++ src/share/man/man5/mk.conf.5	Sun Jun  4 20:04:52 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.99 2023/06/03 11:13:40 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.100 2023/06/04 20:04:52 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 3, 2023
+.Dd June 4, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -94,7 +94,7 @@ or
 .
 .Bl -tag -width 15n
 .
-.\" These entries are sorted alphabetically
+.\" These entries are sorted alphabetically.
 .
 .It Sy BSDOBJDIR
 The real path to the object directory tree for the
@@ -122,11 +122,53 @@ out of date or non-existent targets.
 .
 .It Sy BUILDID
 Identifier for the build.
+If set, this should be a short string that is suitable for use as
+part of a file or directory name.
 The identifier will be appended to
 object directory names, and can be consulted in the
 .Xr make 1
 configuration file in order to set additional build parameters,
 such as compiler flags.
+It will also be used as part of the kernel version string,
+which can be shown by
+.Dq Li uname \-v .
+.DFLTu
+.
+.It Sy BUILDINFO
+Optional multi-line string containing information about the build.
+This will appear in
+.Sy DESTDIR Ns Pa /etc/release ,
+and it will be stored in the
+.Va buildinfo
+variable in any kernels that are built.
+When such kernels are booted, the
+.Xr sysctl 7
+.Va kern.buildinfo
+variable will report this value.
+The string may contain backslash escape sequences, such as
+.Dq "\e\e"
+(representing a backslash character)
+and
+.Dq "\en"
+(representing a newline).
+.DFLTu
+.
+.It Sy BUILDSEED
+.Xr g++ 1
+uses random numbers when compiling C++ code.
+This variable seeds the
+.Xr g++ 1
+random number generator using
+.Fl frandom-seed
+with this value.
+By default, it is set to
+.Do NetBSD-( Ns Em majorversion ) Dc .
+Using a fixed value causes C++ binaries to be the same when
+built from the same sources, resulting in identical (reproducible) builds.
+Additional information is available in the
+.Xr g++ 1
+documentation of
+.Fl frandom-seed .
 .DFLTu
 .
 .It Sy COPTS
@@ -134,13 +176,15 @@ Extra options for the C compiler.
 Should be appended to (e.g.,
 .Sy COPTS+=-g ) ,
 rather than explicitly set.
-Note that
+.Pp
+.Em Note :
 .Sy CPUFLAGS ,
 not
 .Sy COPTS ,
 should be used for
 compiler flags that select CPU-related options.
-Also note that
+.Pp
+.Em Note :
 .Sy CFLAGS
 should never be set in
 .Nm .
@@ -185,6 +229,34 @@ Empty string if
 .Sy USETOOLS=yes ;
 unset otherwise.
 .
+.It Sy EXTERNAL_TOOLCHAIN
+If defined, this variable indicates the root directory of
+an external toolchain which will be used to build the tree.
+For example, if a platform is a
+.Sy TOOLCHAIN_MISSING
+platform,
+.Sy EXTERNAL_TOOLCHAIN
+can be used to re-enable the cross-compile framework.
+.Pp
+If
+.Sy EXTERNAL_TOOLCHAIN
+is defined, act as
+.Sy MKGCC=no ,
+since the external version of the compiler may not be
+able to build the library components of the in-tree compiler.
+.Pp
+This variable should be used in conjunction with an appropriate
+.Sy HAVE_GCC
+or
+.Sy HAVE_LLVM
+setting to control the compiler flags.
+.Pp
+.Em Note :
+This variable is not yet used in as many places as it should be.
+Expect the exact semantics of this variable to change in the short
+term as parts of the cross-compile framework continue to be cleaned up.
+.DFLTu
+.
 .It Sy EXTSRCSRCDIR
 Obsolete.
 .
@@ -456,6 +528,11 @@ is compiled with support for
 .In complex.h .
 .DFLTy
 .
+.It Sy MKCROSSGDB
+.YorN
+Create a cross-gdb as a host tool.
+.DFLTn
+.
 .It Sy MKCRYPTO
 Obsolete.
 .
@@ -499,7 +576,13 @@ and acts as
 .
 .It Sy MKDEBUG
 .YorN
-Indicates whether separate debugging symbols should be installed into
+Indicates whether debug information should be generated for
+all userland binaries.
+The result is collected as an additional
+.Sy debug.tgz
+and
+.Sy xdebug.tgz
+set and installed in
 .Sy DESTDIR Ns Pa /usr/libdata/debug .
 .NODEF NODEBUG
 .DFLTn
@@ -510,10 +593,14 @@ Indicates whether 

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 20:04:52 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf(5): add more from BUILDING and bsd.README

Add from BUILDING or bsd.README:
BUILDINFO, BUILDSEED, EXTERNAL_TOOLCHAIN, MKCROSSGDB,
MKREPRO_TIMESTAMP, TOOLCHAIN_MISSING, X11SRCDIR

Clarify BUILDID.
Improve MKDEBUG, MKOBJ, MKX11, NETBSDSRCDIR, USETOOLS,
Consistent Note: formatting.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/share/man/man5/mk.conf.5

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

CVS commit: src/external/apache2/llvm

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 17:48:05 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc

Log Message:
llvm tool build: fix warning

-std=c++14 is for HOST_CXXFLAGS not HOST_CPPFLAGS.

Fixes: cc1: warning: command-line option '-std=c++14' is valid for C++/ObjC++ 
but not for C


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/apache2/llvm/Makefile.inc

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

Modified files:

Index: src/external/apache2/llvm/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.7 src/external/apache2/llvm/Makefile.inc:1.8
--- src/external/apache2/llvm/Makefile.inc:1.7	Sat Jun  3 21:33:01 2023
+++ src/external/apache2/llvm/Makefile.inc	Sun Jun  4 17:48:05 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2023/06/03 21:33:01 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2023/06/04 17:48:05 lukem Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -36,7 +36,7 @@ HOST_CXXFLAGS+=	-O2 -fno-rtti -fno-excep
 .if ${HOST_SUPPORTS_MODULES:Uno} == "yes"
 HOST_CXXFLAGS+=	${MODULES_CXXFLAGS}
 .endif
-HOST_CPPFLAGS+=	-std=c++14
+HOST_CXXFLAGS+=	-std=c++14
 LLVM_TARGETS=	x86,powerpc,sparc,aarch64,arm,mips
 .else
 LLVM_INCLUDE_CONFIG=	${LLVM_TOPLEVEL}/config

CVS commit: src/external/apache2/llvm

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 17:48:05 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc

Log Message:
llvm tool build: fix warning

-std=c++14 is for HOST_CXXFLAGS not HOST_CPPFLAGS.

Fixes: cc1: warning: command-line option '-std=c++14' is valid for C++/ObjC++ 
but not for C


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/apache2/llvm/Makefile.inc

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

CVS commit: src/tools

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 16:54:00 UTC 2023

Modified Files:
src/tools: Makefile.host

Log Message:
tools: revert use of 

tools/Makefile.host revision 1.35 changed from
  setting various NOxxx variables and .include 
to
  .include 
which sets the same NOxxx variables, .include 
which optionally .include ../Makefile.inc before .include .

This chnage caused build failures with HAVE_LLVM=yes, so revert rev 1.35.
(Maybe to do with the .include ../Makefile.inc. The tools/llvm* build is
tricky, and it's easier to revert this change than debug.)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/tools/Makefile.host

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

Modified files:

Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.35 src/tools/Makefile.host:1.36
--- src/tools/Makefile.host:1.35	Sun Jun  4 10:00:20 2023
+++ src/tools/Makefile.host	Sun Jun  4 16:53:59 2023
@@ -1,6 +1,11 @@
-#	$NetBSD: Makefile.host,v 1.35 2023/06/04 10:00:20 lukem Exp $
+#	$NetBSD: Makefile.host,v 1.36 2023/06/04 16:53:59 lukem Exp $
 
-.include 
+NOINFO= # defined
+NOLINT= # defined
+NOMAN=  # defined
+MKREPRO=no	# Native toolchain might be unable to do it
+
+.include 
 
 .ifndef NOCOMPATLIB
 # Use TOOLDIR copy of libnbcompat and associated *.h files

CVS commit: src/tools

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 16:54:00 UTC 2023

Modified Files:
src/tools: Makefile.host

Log Message:
tools: revert use of 

tools/Makefile.host revision 1.35 changed from
  setting various NOxxx variables and .include 
to
  .include 
which sets the same NOxxx variables, .include 
which optionally .include ../Makefile.inc before .include .

This chnage caused build failures with HAVE_LLVM=yes, so revert rev 1.35.
(Maybe to do with the .include ../Makefile.inc. The tools/llvm* build is
tricky, and it's easier to revert this change than debug.)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/tools/Makefile.host

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

CVS commit: src/tools

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 10:00:20 UTC 2023

Modified Files:
src/tools: Makefile.host Makefile.nbincludes

Log Message:
tools: use  where appropriate

bsd.hostinit.mk sets a bunch of NOxxx variables before
including bsd.init.mk (which includes bsd.own.mk),
so simplify instead of replicating the NOxxx setup
for host tools.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/tools/Makefile.host
cvs rdiff -u -r1.5 -r1.6 src/tools/Makefile.nbincludes

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

Modified files:

Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.34 src/tools/Makefile.host:1.35
--- src/tools/Makefile.host:1.34	Fri May  4 14:50:18 2018
+++ src/tools/Makefile.host	Sun Jun  4 10:00:20 2023
@@ -1,11 +1,6 @@
-#	$NetBSD: Makefile.host,v 1.34 2018/05/04 14:50:18 christos Exp $
+#	$NetBSD: Makefile.host,v 1.35 2023/06/04 10:00:20 lukem Exp $
 
-NOINFO= # defined
-NOLINT= # defined
-NOMAN=  # defined
-MKREPRO=no	# Native toolchain might be unable to do it
-
-.include 
+.include 
 
 .ifndef NOCOMPATLIB
 # Use TOOLDIR copy of libnbcompat and associated *.h files

Index: src/tools/Makefile.nbincludes
diff -u src/tools/Makefile.nbincludes:1.5 src/tools/Makefile.nbincludes:1.6
--- src/tools/Makefile.nbincludes:1.5	Wed Sep 14 00:41:04 2016
+++ src/tools/Makefile.nbincludes	Sun Jun  4 10:00:20 2023
@@ -1,15 +1,6 @@
-#	$NetBSD: Makefile.nbincludes,v 1.5 2016/09/14 00:41:04 christos Exp $
+#	$NetBSD: Makefile.nbincludes,v 1.6 2023/06/04 10:00:20 lukem Exp $
 
-# NOxxx definitions are copied from Makefile.host, and are
-# required before .include .   The include of bsd.own.mk
-# itself is required to get definitions of TOOL_* variables used in
-# "!=" variable assignments (which are performed early).
-#
-NOINFO=		# defined
-NOLINT=		# defined
-NOMAN=		# defined
-
-.include 
+.include 
 
 _ARCHDIR=	${.CURDIR}/../../sys/arch
 _INCDIR=	${.CURDIR}/../../include

CVS commit: src/tools

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun Jun  4 10:00:20 UTC 2023

Modified Files:
src/tools: Makefile.host Makefile.nbincludes

Log Message:
tools: use  where appropriate

bsd.hostinit.mk sets a bunch of NOxxx variables before
including bsd.init.mk (which includes bsd.own.mk),
so simplify instead of replicating the NOxxx setup
for host tools.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/tools/Makefile.host
cvs rdiff -u -r1.5 -r1.6 src/tools/Makefile.nbincludes

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

CVS commit: src/usr.sbin/sysinst/arch/mac68k

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:25 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/mac68k: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/mac68k/Makefile

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

Modified files:

Index: src/usr.sbin/sysinst/arch/mac68k/Makefile
diff -u src/usr.sbin/sysinst/arch/mac68k/Makefile:1.3 src/usr.sbin/sysinst/arch/mac68k/Makefile:1.4
--- src/usr.sbin/sysinst/arch/mac68k/Makefile:1.3	Mon Aug 10 06:54:45 2020
+++ src/usr.sbin/sysinst/arch/mac68k/Makefile	Sat Jun  3 21:33:25 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2020/08/10 06:54:45 rin Exp $
+#	$NetBSD: Makefile,v 1.4 2023/06/03 21:33:25 lukem Exp $
 #
 # Makefile for mac68k
 #
@@ -13,7 +13,6 @@ NO_GPT=		yes
 NO_MBR=		yes
 .endif
 
-# XXX
-COPTS.md.c=	-Wno-stringop-truncation
+COPTS.md.c=	${CC_WNO_STRINGOP_TRUNCATION}
 
 .include "../../Makefile.inc"

CVS commit: src/usr.sbin/sysinst/arch/mac68k

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:25 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/mac68k: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/mac68k/Makefile

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

CVS commit: src/external

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:02 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64:
Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/bin/server/Makefile

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

Modified files:

Index: src/external/apache2/llvm/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.6 src/external/apache2/llvm/Makefile.inc:1.7
--- src/external/apache2/llvm/Makefile.inc:1.6	Mon Feb 28 16:30:10 2022
+++ src/external/apache2/llvm/Makefile.inc	Sat Jun  3 21:33:01 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2022/02/28 16:30:10 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2023/06/03 21:33:01 lukem Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -19,9 +19,6 @@ CONFIG_DIR:=	${.PARSEDIR}/autoconf
 
 CPPFLAGS+=	-I. -I${CLANG_SRCDIR}/include -I${LLVM_SRCDIR}/include
 
-# Bogus warning with -O2 in GCC 7 and 8.
-CWARNFLAGS.gcc+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} < 9:? -Wno-stringop-overflow :}
-
 MODULES_CXXFLAGS=	-fmodules -fcxx-modules -Werror=incomplete-umbrella \
 			-fmodules-validate-system-headers \
 			-Xclang -fmodules-local-submodule-visibility \

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3	Fri Sep 17 02:18:05 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2021/09/17 02:18:05 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 CPPFLAGS+=	-I${TOPDIR}/include
 
 CWARNFLAGS.clang+=	-Wno-error=cast-qual-unrelated
-CWARNFLAGS.gcc+=	-Wno-error=stringop-overflow
+CWARNFLAGS.gcc+=	${CC_WNO_STRINGOP_OVERFLOW}
 
 COPTS+=		-fPIC
 

Index: src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
diff -u src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1 src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.2
--- src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1	Tue Dec 28 17:05:44 2021
+++ src/external/bsd/openldap/lib/slapd/back-mdb/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 21:33:02 lukem Exp $
 
 USE_FORT=yes
 LIBISPRIVATE=yes
@@ -13,7 +13,7 @@ LMDB=${LDAP_DISTDIR}/libraries/liblmdb
 
 .PATH: ${BACK_MDB} ${LMDB}
 
-COPTS.mdb.c += -Wno-error=stringop-overflow
+COPTS.mdb.c += ${CC_WNO_STRINGOP_OVERFLOW}
 
 CPPFLAGS+=-I${SLAPD} -I${BACK_MDB} -I${LMDB}
 

Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.32 src/external/mit/xorg/lib/libGL/Makefile:1.33
--- src/external/mit/xorg/lib/libGL/Makefile:1.32	Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/libGL/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2021/07/11 20:52:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.33 2023/06/03 21:33:02 lukem Exp $
 
 .include 
 
@@ -231,9 +231,7 @@ PKGCONFIG_SED_FLAGS= \
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-format -Wno-constant-conversion \
 			-Wno-error=incompatible-pointer-types -Wno-error=atomic-alignment
-.if ${HAVE_GCC:U0} >= 7
-CWARNFLAGS.gcc+=	-Wno-error=stringop-overflow
-.endif
+CWARNFLAGS.gcc+=	${CC_WNO_STRINGOP_OVERFLOW}
 
 .include 
 .include 

Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.3 src/external/mit/xorg/lib/libGL.old/Makefile:1.4
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.3	Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/libGL.old/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 

CVS commit: src/external

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:02 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64:
Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/bin/server/Makefile

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:31:47 UTC 2023

Modified Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/file/lib: Makefile
src/external/bsd/ipf/bin/ipsend: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/i915drmkms: Makefile
src/tests/libexec/ld.elf_so: Makefile

Log Message:
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}

Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of
the older style more complex expressions.

Remove workarounds if they were for a specific
version of gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/bin/ipsend/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.67 -r1.68 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.89 -r1.90 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/libexec/ld.elf_so/Makefile

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

Modified files:

Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.7 src/external/bsd/atf/lib/tools/Makefile:1.8
--- src/external/bsd/atf/lib/tools/Makefile:1.7	Sun Sep 29 23:44:58 2019
+++ src/external/bsd/atf/lib/tools/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 21:31:45 lukem Exp $
 
 NOLINT=		# defined
 
@@ -36,8 +36,6 @@ SRCS=		application.cpp \
 		ui.cpp \
 		user.cpp
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.parser.cpp += -Wno-error=maybe-uninitialized
-.endif
+COPTS.parser.cpp += ${CC_WNO_MAYBE_UNINITIALIZED}
 
 .include 

Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.15 src/external/bsd/file/lib/Makefile:1.16
--- src/external/bsd/file/lib/Makefile:1.15	Tue Dec 17 18:59:39 2019
+++ src/external/bsd/file/lib/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2023/06/03 21:31:45 lukem Exp $
 #
 
 USE_FORT?= yes	# data driven bugs?
@@ -42,6 +42,4 @@ magic.h:magic.h.in
 	${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET}
 CLEANFILES+=	magic.h
 
-CFLAGS+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-maybe-uninitialized :}
-
 .include 

Index: src/external/bsd/ipf/bin/ipsend/Makefile
diff -u src/external/bsd/ipf/bin/ipsend/Makefile:1.5 src/external/bsd/ipf/bin/ipsend/Makefile:1.6
--- src/external/bsd/ipf/bin/ipsend/Makefile:1.5	Wed Feb 12 00:30:48 2020
+++ src/external/bsd/ipf/bin/ipsend/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2020/02/12 00:30:48 fox Exp $
+#	$NetBSD: Makefile,v 1.6 2023/06/03 21:31:45 lukem Exp $
 
 .include 
 .include "../Makefile.inc"
@@ -25,8 +25,6 @@ DPSRCS+=	iplang_y.h
 .PATH:		${UDIST}/ipsend \
 		${UDIST}/iplang
 
-COPTS.ipsopt.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=maybe-uninitialized :}
-
 iplang_y.c: iplang_y.y
 	${_MKTARGET_CREATE}
 	${YACC} -d ${.ALLSRC}

Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.31 src/external/bsd/ntp/bin/ntpd/Makefile:1.32
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.31	Sat Jun  3 09:09:04 2023
+++ src/external/bsd/ntp/bin/ntpd/Makefile	Sat Jun  3 21:31:46 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2023/06/03 09:09:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.32 2023/06/03 21:31:46 lukem Exp $
 
 .include 
 
@@ -87,7 +87,7 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
 .PATH: ${DIST}
 YHEADER=1
 
-COPTS.ntp_control.c+=		${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=maybe-uninitialized :}
+COPTS.ntp_control.c+=		${CC_WNO_MAYBE_UNINITIALIZED}
 COPTS.ntp_loopfilter.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-error=restrict :}
 COPTS.ntp_loopfilter.c+=	${CC_WNO_FORMAT_TRUNCATION}
 COPTS.ntp_crypto.c+=		${CC_WNO_FORMAT_TRUNCATION}

Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:31:47 UTC 2023

Modified Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/file/lib: Makefile
src/external/bsd/ipf/bin/ipsend: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/i915drmkms: Makefile
src/tests/libexec/ld.elf_so: Makefile

Log Message:
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}

Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of
the older style more complex expressions.

Remove workarounds if they were for a specific
version of gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/bin/ipsend/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.67 -r1.68 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.89 -r1.90 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/libexec/ld.elf_so/Makefile

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:30:25 UTC 2023

Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/lib/libbz2: Makefile
src/sys/conf: copts.mk
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
src/sys/modules/savagedrm: Makefile
src/sys/modules/viadrmums: Makefile
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
src/usr.bin/stat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile

Log Message:
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}

Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of
the older style more complex expressions.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/ksh/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libbz2/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/copts.mk
cvs rdiff -u -r1.88 -r1.89 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/quotacheck/Makefile

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

Modified files:

Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.36 src/bin/ksh/Makefile:1.37
--- src/bin/ksh/Makefile:1.36	Sun Sep 29 23:44:58 2019
+++ src/bin/ksh/Makefile	Sat Jun  3 21:30:20 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2019/09/29 23:44:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.37 2023/06/03 21:30:20 lukem Exp $
 
 WARNS=3
 CWARNFLAGS.clang+=	-Wno-error=cast-qual
@@ -48,8 +48,6 @@ ksh.1: ksh.Man mkman
 	${HOST_SH} $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \
 	&& mv ksh.1.tmp ksh.1
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=	-Wno-error=implicit-fallthrough
-.endif
+COPTS+=	${CC_WNO_IMPLICIT_FALLTHROUGH}
 
 .include 

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.21
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20	Sat Jun  3 09:09:01 2023
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sat Jun  3 21:30:20 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2023/06/03 09:09:01 lukem Exp $
+#	$NetBSD: Makefile,v 1.21 2023/06/03 21:30:20 lukem Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -32,9 +32,7 @@ EXTDIST=${.CURDIR}/../../dist
 
 .include 
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=	-Wno-error=implicit-fallthrough
-.endif
+COPTS+=			${CC_WNO_IMPLICIT_FALLTHROUGH}
 
 COPTS.libverify.c+=	${CC_WNO_FORMAT_TRUNCATION}
 

Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.15 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.16
--- 

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:30:25 UTC 2023

Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/lib/libbz2: Makefile
src/sys/conf: copts.mk
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
src/sys/modules/savagedrm: Makefile
src/sys/modules/viadrmums: Makefile
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
src/usr.bin/stat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile

Log Message:
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}

Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of
the older style more complex expressions.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/ksh/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libbz2/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/copts.mk
cvs rdiff -u -r1.88 -r1.89 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/quotacheck/Makefile

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:28:53 UTC 2023

Modified Files:
src/tests/kernel: Makefile
src/usr.bin/newsyslog: Makefile

Log Message:
adapt to ${CC_WNO_FORMAT_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tests/kernel/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/newsyslog/Makefile

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:28:53 UTC 2023

Modified Files:
src/tests/kernel: Makefile
src/usr.bin/newsyslog: Makefile

Log Message:
adapt to ${CC_WNO_FORMAT_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tests/kernel/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/newsyslog/Makefile

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

Modified files:

Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.71 src/tests/kernel/Makefile:1.72
--- src/tests/kernel/Makefile:1.71	Fri Apr 21 21:50:05 2023
+++ src/tests/kernel/Makefile	Sat Jun  3 21:28:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2023/04/21 21:50:05 gutteridge Exp $
+# $NetBSD: Makefile,v 1.72 2023/06/03 21:28:52 lukem Exp $
 
 NOMAN=		# defined
 
@@ -82,10 +82,8 @@ t_subr_prf.c: gen_t_subr_prf ${NETBSDSRC
 
 CPPFLAGS.t_subr_prf.c=	-Wno-pointer-sign	# XXX platform vs kernel SHA2
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 # Test explicitly tests failure modes.
-CPPFLAGS.t_subr_prf.c+=	-Wno-error=format-truncation
-.endif
+CPPFLAGS.t_subr_prf.c+=	${CC_WNO_FORMAT_TRUNCATION}
 
 SANITIZER_RENAME_CLASSES+=		t_subr_prf
 SANITIZER_RENAME_FILES.t_subr_prf+=	t_subr_prf.c

Index: src/usr.bin/newsyslog/Makefile
diff -u src/usr.bin/newsyslog/Makefile:1.20 src/usr.bin/newsyslog/Makefile:1.21
--- src/usr.bin/newsyslog/Makefile:1.20	Sun Sep 29 23:45:01 2019
+++ src/usr.bin/newsyslog/Makefile	Sat Jun  3 21:28:53 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2019/09/29 23:45:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.21 2023/06/03 21:28:53 lukem Exp $
 
 PROG=	newsyslog
 SRCS=	newsyslog.c
@@ -8,8 +8,6 @@ MLINKS+=newsyslog.8 newsyslog.conf.5
 
 .include 
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.newsyslog.c += -Wno-error=format-truncation
-.endif
+COPTS.newsyslog.c +=	${CC_WNO_FORMAT_TRUNCATION}
 
 .include 

CVS commit: src/external/mpl/dhcp/bin/server

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:27:11 UTC 2023

Modified Files:
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
dhcp: remove gcc 8 workaround

(if it's needed, add it back using ${CC_WNO_FORMAT_OVERFLOW})


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/bin/server/Makefile

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

Modified files:

Index: src/external/mpl/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.8 src/external/mpl/dhcp/bin/server/Makefile:1.9
--- src/external/mpl/dhcp/bin/server/Makefile:1.8	Sat Jun  3 09:09:08 2023
+++ src/external/mpl/dhcp/bin/server/Makefile	Sat Jun  3 21:27:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:08 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 21:27:11 lukem Exp $
 
 .include 
 
@@ -19,7 +19,6 @@ FILES=	dhcpd.conf
 COPTS.ddns.c +=-Wno-stringop-overflow
 .endif
 
-COPTS.mdb6.c +=		${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
 COPTS.omapi.c +=	-Wno-stack-protector
 COPTS.confpars.c+=	${CC_WNO_STRINGOP_TRUNCATION}
 COPTS.mdb6.c+=		${CC_WNO_STRINGOP_OVERFLOW}

CVS commit: src/external/mpl/dhcp/bin/server

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:27:11 UTC 2023

Modified Files:
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
dhcp: remove gcc 8 workaround

(if it's needed, add it back using ${CC_WNO_FORMAT_OVERFLOW})


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/bin/server/Makefile

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

CVS commit: src/external/bsd/ipf/bin/ipmon

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:53 UTC 2023

Modified Files:
src/external/bsd/ipf/bin/ipmon: Makefile

Log Message:
ipmon: remove duplicate warning suppression


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/bin/ipmon/Makefile

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

Modified files:

Index: src/external/bsd/ipf/bin/ipmon/Makefile
diff -u src/external/bsd/ipf/bin/ipmon/Makefile:1.6 src/external/bsd/ipf/bin/ipmon/Makefile:1.7
--- src/external/bsd/ipf/bin/ipmon/Makefile:1.6	Sat Jun  3 09:09:03 2023
+++ src/external/bsd/ipf/bin/ipmon/Makefile	Sat Jun  3 21:26:52 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2023/06/03 09:09:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2023/06/03 21:26:52 lukem Exp $
 
 PROG=		ipmon
 SRCS=		ipmon.c ipmon_y.c ipmon_l.c
@@ -11,8 +11,6 @@ DPSRCS+=	ipmon_l.h ipmon_y.h
 CLEANFILES+=	ipmon_y.c ipmon_y.h
 CLEANFILES+=	ipmon_l.c ipmon_l.h
 
-COPTS.ipmon.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-
 ipmon_y.c: ipmon_y.y
 	${_MKTARGET_CREATE}
 	${YACC} -d ${.ALLSRC}
@@ -36,6 +34,6 @@ ipmon_l.h: lexer.h
 	${TOOL_SED} -e 's/yy/ipmon_yy/g' \
 	${.ALLSRC} > ${.TARGET}
 
-COPTS.ipmon.c+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_OVERFLOW}
+COPTS.ipmon.c+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_OVERFLOW}
 
 .include 

CVS commit: src/external/bsd/ipf/bin/ipmon

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:53 UTC 2023

Modified Files:
src/external/bsd/ipf/bin/ipmon: Makefile

Log Message:
ipmon: remove duplicate warning suppression


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/bin/ipmon/Makefile

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:29 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/newfs_udf: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/pf: Makefile.inc

Log Message:
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}

Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
which works for both clang and gcc, and remove compiler-specific
equivalents.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.296 -r1.297 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/pf/Makefile.inc

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

Modified files:

Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.17
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16	Sat Jun  3 09:09:02 2023
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile	Sat Jun  3 21:26:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2023/06/03 09:09:02 lukem Exp $
+#	$NetBSD: Makefile,v 1.17 2023/06/03 21:26:27 lukem Exp $
 
 PROG=	mdnsd
 
@@ -17,8 +17,8 @@ COPTS.uds_daemon.c += -Wno-stack-protect
 
 MAN=	mdnsd.8
 
-CWARNFLAGS.clang+=	-Wno-unused-value -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+=	-Wno-unused-value
+CWARNFLAGS+=		${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
 
 COPTS.DNSCommon.c+=	${CC_WNO_RETURN_LOCAL_ADDR}
 

Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.8 src/external/bsd/ipf/Makefile.inc:1.9
--- src/external/bsd/ipf/Makefile.inc:1.8	Sat Jun  3 09:09:03 2023
+++ src/external/bsd/ipf/Makefile.inc	Sat Jun  3 21:26:27 2023
@@ -1,11 +1,10 @@
-#	$NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:03 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2023/06/03 21:26:27 lukem Exp $
 
 WARNS?=	1	# XXX -Wcast-qual -Wshadow
 CWARNFLAGS.clang+=	-Wno-format -Wno-tautological-compare \
 			-Wno-self-assign -Wno-array-bounds \
-			-Wno-error=unused-const-variable \
-			-Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+			-Wno-error=unused-const-variable
+CWARNFLAGS+=		${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
 
 .include 
 

Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.24 src/external/bsd/tcpdump/bin/Makefile:1.25
--- src/external/bsd/tcpdump/bin/Makefile:1.24	Sat Jun  3 09:09:05 2023
+++ src/external/bsd/tcpdump/bin/Makefile	Sat Jun  3 21:26:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2023/06/03 09:09:05 lukem Exp $	
+#	$NetBSD: Makefile,v 1.25 2023/06/03 21:26:27 lukem Exp $	
 
 WARNS?=	1	# XXX: need to cleanup later
 
@@ -205,8 +205,7 @@ tcpdump.8: tcpdump.1.in
 	@rm -f ${.TARGET}
 	cp ${.ALLSRC} ${.TARGET}
 
-CWARNFLAGS.clang+=	-Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+=		

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:29 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/newfs_udf: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/pf: Makefile.inc

Log Message:
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}

Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
which works for both clang and gcc, and remove compiler-specific
equivalents.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.296 -r1.297 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/pf/Makefile.inc

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

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:24:58 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk bsd.lua.mk bsd.own.mk bsd.sys.mk

Log Message:
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk

Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no.
Test ${MKSTRIPSYM} != "no".


To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.1340 -r1.1341 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.sys.mk

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

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.393 src/share/mk/bsd.lib.mk:1.394
--- src/share/mk/bsd.lib.mk:1.393	Sun May 28 10:33:13 2023
+++ src/share/mk/bsd.lib.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.393 2023/05/28 10:33:13 lukem Exp $
+#	$NetBSD: bsd.lib.mk,v 1.394 2023/06/03 21:24:57 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -563,7 +563,7 @@ _LIBLDOPTS+=	-Wl,-rpath,${SHLIBDIR} \
 _LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
 		-L=${SHLIBINSTALLDIR}
 .endif
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 _LIBLDOPTS+=	-Wl,-x
 .else
 _LIBLDOPTS+=	-Wl,-X

Index: src/share/mk/bsd.lua.mk
diff -u src/share/mk/bsd.lua.mk:1.9 src/share/mk/bsd.lua.mk:1.10
--- src/share/mk/bsd.lua.mk:1.9	Sun Apr 16 20:46:17 2023
+++ src/share/mk/bsd.lua.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lua.mk,v 1.9 2023/04/16 20:46:17 nikita Exp $
+#	$NetBSD: bsd.lua.mk,v 1.10 2023/06/03 21:24:57 lukem Exp $
 #
 # Build rules and definitions for Lua modules
 
@@ -129,7 +129,7 @@ DPSRCS+=${LUA_SRCS.${_M}}
 SRCS+=${LUA_SRCS.${_M}}
 
 LUA_LDOPTS=	-Wl,--warn-shared-textrel
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 LUA_LDOPTS+=	-Wl,-x
 .else
 LUA_LDOPTS+=	-Wl,-X

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1340 src/share/mk/bsd.own.mk:1.1341
--- src/share/mk/bsd.own.mk:1.1340	Sat Jun  3 21:23:49 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1341 2023/06/03 21:24:57 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1213,6 +1213,7 @@ _MKVARS.yes= \
 	MKSHARE \
 	MKSKEY \
 	MKSTATICLIB \
+	MKSTRIPSYM \
 	MKUNBOUND \
 	MKX11FONTS \
 	MKYP

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.313 src/share/mk/bsd.sys.mk:1.314
--- src/share/mk/bsd.sys.mk:1.313	Sat Apr 29 20:31:59 2023
+++ src/share/mk/bsd.sys.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.313 2023/04/29 20:31:59 christos Exp $
+#	$NetBSD: bsd.sys.mk,v 1.314 2023/06/03 21:24:57 lukem Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -347,7 +347,7 @@ OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][dx]' -
 OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][adt]' -K '[$$][adt]\.*'
 .endif
 
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
 .else
 OBJCOPYLIBFLAGS?=-X ${OBJCOPYLIBFLAGS_EXTRA}

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:24:58 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk bsd.lua.mk bsd.own.mk bsd.sys.mk

Log Message:
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk

Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no.
Test ${MKSTRIPSYM} != "no".


To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.1340 -r1.1341 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.sys.mk

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

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:50 UTC 2023

Modified Files:
src/share/mk: bsd.obj.mk bsd.own.mk

Log Message:
bsd.obj.mk: move MKHOSTOBJ to bsd.own.mk

Add default for MKHOSTOBJ=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.obj.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1339 -r1.1340 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.53 src/share/mk/bsd.obj.mk:1.54
--- src/share/mk/bsd.obj.mk:1.53	Tue Mar 29 22:48:04 2022
+++ src/share/mk/bsd.obj.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.obj.mk,v 1.53 2022/03/29 22:48:04 christos Exp $
+#	$NetBSD: bsd.obj.mk,v 1.54 2023/06/03 21:23:49 lukem Exp $
 
 .if !defined(_BSD_OBJ_MK_)
 _BSD_OBJ_MK_=1
@@ -51,7 +51,7 @@ __usrobjdirpf:=	${__usrobjdirpf}.${BUILD
 __need_objdir_target=yes
 .endif
 
-.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
+.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ} != "no")
 # In case .CURDIR has been twiddled by a .mk file and is now relative,
 # make it absolute again.
 .if ${__curdir:M/*} == ""

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1339 src/share/mk/bsd.own.mk:1.1340
--- src/share/mk/bsd.own.mk:1.1339	Sat Jun  3 21:23:07 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1355,6 +1355,7 @@ _MKVARS.no= \
 	MKDTRACE \
 	MKFIRMWARE \
 	MKGROFFHTMLDOC \
+	MKHOSTOBJ \
 	MKKYUA \
 	MKLIBCXX \
 	MKLINT \

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:50 UTC 2023

Modified Files:
src/share/mk: bsd.obj.mk bsd.own.mk

Log Message:
bsd.obj.mk: move MKHOSTOBJ to bsd.own.mk

Add default for MKHOSTOBJ=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.obj.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1339 -r1.1340 src/share/mk/bsd.own.mk

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

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:07 UTC 2023

Modified Files:
src/share/mk: bsd.dep.mk bsd.own.mk

Log Message:
bsd.dep.mk: move MKDEPINCLUDES to bsd.own.mk

Add default for MKDEPINCLUDES=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.dep.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.1338 -r1.1339 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.88 src/share/mk/bsd.dep.mk:1.89
--- src/share/mk/bsd.dep.mk:1.88	Tue Dec 14 16:22:07 2021
+++ src/share/mk/bsd.dep.mk	Sat Jun  3 21:23:07 2023
@@ -1,4 +1,6 @@
-#	$NetBSD: bsd.dep.mk,v 1.88 2021/12/14 16:22:07 christos Exp $
+#	$NetBSD: bsd.dep.mk,v 1.89 2023/06/03 21:23:07 lukem Exp $
+
+.include 
 
 # Basic targets
 realdepend:	beforedepend .depend afterdepend
@@ -39,7 +41,7 @@ ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS
 
 MKDEPSUFFLAGS=-s ${MKDEP_SUFFIXES:Q}
 
-.if defined(MKDEPINCLUDES) && ${MKDEPINCLUDES} != "no"
+.if ${MKDEPINCLUDES} != "no"
 .STALE:
 	@echo Rebuilding dependency file: ${.ALLSRC}
 	@rm -f ${.ALLSRC}

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1338 src/share/mk/bsd.own.mk:1.1339
--- src/share/mk/bsd.own.mk:1.1338	Sat Jun  3 21:21:32 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:23:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1338 2023/06/03 21:21:32 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1350,6 +1350,7 @@ _MKVARS.no= \
 	MKCTF \
 	MKDEBUG \
 	MKDEBUGLIB \
+	MKDEPINCLUDES \
 	MKDTB \
 	MKDTRACE \
 	MKFIRMWARE \

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:07 UTC 2023

Modified Files:
src/share/mk: bsd.dep.mk bsd.own.mk

Log Message:
bsd.dep.mk: move MKDEPINCLUDES to bsd.own.mk

Add default for MKDEPINCLUDES=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.dep.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.1338 -r1.1339 src/share/mk/bsd.own.mk

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

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:21:32 UTC 2023

Modified Files:
src/share/mk: bsd.clean.mk bsd.own.mk

Log Message:
bsd.*.mk: move MKCLEAN* to bsd.own.mk

Move the defaults for MKCLEANSRC and MKCLEANVERIFY
from bsd.clean.mk to bsd.own.mk _MKVARS.yes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.clean.mk
cvs rdiff -u -r1.1337 -r1.1338 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.clean.mk
diff -u src/share/mk/bsd.clean.mk:1.9 src/share/mk/bsd.clean.mk:1.10
--- src/share/mk/bsd.clean.mk:1.9	Tue Dec  7 22:40:52 2021
+++ src/share/mk/bsd.clean.mk	Sat Jun  3 21:21:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.clean.mk,v 1.9 2021/12/07 22:40:52 rillig Exp $
+# $NetBSD: bsd.clean.mk,v 1.10 2023/06/03 21:21:32 lukem Exp $
 
 # 
 #
@@ -31,9 +31,6 @@ _BSD_CLEAN_MK_=1
 
 .include 
 
-MKCLEANSRC?=	yes
-MKCLEANVERIFY?=	yes
-
 clean:		.PHONY __doclean
 __doclean:	.PHONY .MADE __cleanuse CLEANFILES
 cleandir:	.PHONY clean __docleandir

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1337 src/share/mk/bsd.own.mk:1.1338
--- src/share/mk/bsd.own.mk:1.1337	Sat Jun  3 09:09:13 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:21:32 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1337 2023/06/03 09:09:13 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1338 2023/06/03 21:21:32 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1172,6 +1172,8 @@ _MKVARS.yes= \
 	MKATF \
 	MKBINUTILS \
 	MKBSDTAR \
+	MKCLEANSRC \
+	MKCLEANVERIFY \
 	MKCOMPLEX \
 	MKCVS \
 	MKCXX \

CVS commit: src/share/mk

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:21:32 UTC 2023

Modified Files:
src/share/mk: bsd.clean.mk bsd.own.mk

Log Message:
bsd.*.mk: move MKCLEAN* to bsd.own.mk

Move the defaults for MKCLEANSRC and MKCLEANVERIFY
from bsd.clean.mk to bsd.own.mk _MKVARS.yes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.clean.mk
cvs rdiff -u -r1.1337 -r1.1338 src/share/mk/bsd.own.mk

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

CVS commit: src/distrib/sets

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:20:53 UTC 2023

Modified Files:
src/distrib/sets: mkvars.mk

Log Message:
mkvars.mk: sort MKEXTRAVARS and remove dupes

Sort MKEXTRAVARS.
Remove obsolete MKBFD.
Remove entries already in  _MKVARS.no or _MKVARS.yes:
MKCOMPATTESTS MKDTC MKDYNAMICROOT MKFIRMWARE MKMANZ
MKRADEONFIRMWARE MKSLJIT MKSOFTFLOAT MKXORG_SERVER

Sorted output of comparing "before" and "after" is identical
besides those variables listed above.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/mkvars.mk

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

Modified files:

Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.41 src/distrib/sets/mkvars.mk:1.42
--- src/distrib/sets/mkvars.mk:1.41	Sun Aug 21 07:10:03 2022
+++ src/distrib/sets/mkvars.mk	Sat Jun  3 21:20:53 2023
@@ -1,48 +1,43 @@
-# $NetBSD: mkvars.mk,v 1.41 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: mkvars.mk,v 1.42 2023/06/03 21:20:53 lukem Exp $
 
+#
+# Extra variables to print.
+# Do not include entries from  _MKVARS.no and _MKVAR.yes.
+# Please keep alphabetically sorted with one entry per line.
+#
 MKEXTRAVARS= \
-	MACHINE \
-	MACHINE_ARCH \
-	MACHINE_CPU \
+	ARCH64 \
+	EABI \
 	HAVE_ACPI \
+	HAVE_BINUTILS \
 	HAVE_GCC \
 	HAVE_GDB \
-	HAVE_XORG_SERVER_VER \
-	HAVE_XORG_GLAMOR \
+	HAVE_LIBGCC_EH \
 	HAVE_MESA_VER \
 	HAVE_NVMM \
-	HAVE_BINUTILS \
-	HAVE_LIBGCC_EH \
 	HAVE_OPENSSL \
 	HAVE_SSP \
 	HAVE_UEFI \
-	OBJECT_FMT \
-	TOOLCHAIN_MISSING \
+	HAVE_XORG_GLAMOR \
+	HAVE_XORG_SERVER_VER \
 	KERNEL_DIR \
-	MKMANZ \
-	MKBFD \
+	MACHINE \
+	MACHINE_ARCH \
+	MACHINE_CPU \
+	MAKEVERBOSE \
 	MKCOMPAT \
-	MKCOMPATTESTS \
 	MKCOMPATMODULES \
-	MKDTC \
-	MKDYNAMICROOT \
-	MKFIRMWARE \
 	MKMANPAGES \
-	MKSLJIT \
-	MKSOFTFLOAT \
-	MKXORG \
-	MKXORG_SERVER \
-	MKRADEONFIRMWARE \
 	MKSTATICPIE \
+	MKXORG \
+	NETBSDSRCDIR \
+	OBJECT_FMT \
+	TARGET_ENDIANNESS \
+	TOOLCHAIN_MISSING \
 	USE_INET6 \
 	USE_KERBEROS \
 	USE_LDAP \
-	USE_YP \
-	NETBSDSRCDIR \
-	MAKEVERBOSE \
-	TARGET_ENDIANNESS \
-	EABI \
-	ARCH64
+	USE_YP
 
 #
 

CVS commit: src/distrib/sets

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:20:53 UTC 2023

Modified Files:
src/distrib/sets: mkvars.mk

Log Message:
mkvars.mk: sort MKEXTRAVARS and remove dupes

Sort MKEXTRAVARS.
Remove obsolete MKBFD.
Remove entries already in  _MKVARS.no or _MKVARS.yes:
MKCOMPATTESTS MKDTC MKDYNAMICROOT MKFIRMWARE MKMANZ
MKRADEONFIRMWARE MKSLJIT MKSOFTFLOAT MKXORG_SERVER

Sorted output of comparing "before" and "after" is identical
besides those variables listed above.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/mkvars.mk

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

CVS commit: src/share/man/man5

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 11:13:41 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf: fix the year


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.98 src/share/man/man5/mk.conf.5:1.99
--- src/share/man/man5/mk.conf.5:1.98	Thu Jun  1 21:58:05 2023
+++ src/share/man/man5/mk.conf.5	Sat Jun  3 11:13:40 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.98 2023/06/01 21:58:05 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.99 2023/06/03 11:13:40 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 1, 2022
+.Dd June 3, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation