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([================================================])

Reply via email to