diff options
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/bmake/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/bmake/Makefile.config | 3 | ||||
-rw-r--r-- | usr.bin/bmake/config.h | 4 | ||||
-rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 27 |
4 files changed, 16 insertions, 22 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 5a0bf44fb0fb..b243cd0275b6 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.126 2024/03/10 17:46:44 sjg Exp $ +# $Id: Makefile,v 1.127 2024/03/19 16:03:23 sjg Exp $ PROG?= ${.CURDIR:T} @@ -60,7 +60,7 @@ CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}} COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" -.for x in FORCE_MACHINE FORCE_MACHINE_ARCH +.for x in FORCE_MAKE_OS FORCE_MACHINE FORCE_MACHINE_ARCH .ifdef $x COPTS.main.c+= "-D$x=\"${$x}\"" .endif diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 88ec643b8a4a..ee717d952846 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -6,11 +6,12 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20240309 +_MAKE_VERSION?=20240430 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake CC?= cc +MAKE_OS?= DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk EGREP = egrep diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h index 281e105d853d..3ca313216962 100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@ -282,7 +282,7 @@ #define PACKAGE_NAME "bmake" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "bmake 20240212" +#define PACKAGE_STRING "bmake 20240314" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bmake" @@ -291,7 +291,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20240212" +#define PACKAGE_VERSION "20240314" /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ /* #undef STAT_MACROS_BROKEN */ diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index dcec9297828c..a461d0c874c9 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -1,9 +1,9 @@ # This is a generated file, do NOT edit! # See contrib/bmake/bsd.after-import.mk # -# $Id: Makefile,v 1.211 2024/03/10 17:46:44 sjg Exp $ +# $Id: Makefile,v 1.216 2024/04/30 16:42:50 sjg Exp $ # -# $NetBSD: Makefile,v 1.342 2024/01/07 02:07:44 sjg Exp $ +# $NetBSD: Makefile,v 1.344 2024/04/30 16:41:32 sjg Exp $ # # Unit tests for make(1) # @@ -477,20 +477,11 @@ BROKEN_TESTS+= sh-flags BROKEN_TESTS+= varmod-localtime .endif -.if ${.MAKE.OS:NCYGWIN*} == "" -BROKEN_TESTS+= \ - export \ - opt-chdir \ - opt-keep-going-indirect \ - -.endif - - .if ${.MAKE.OS:NDarwin} == "" BROKEN_TESTS+= shell-ksh .endif -.if ${.MAKE.OS:MIRIX*} != "" +.if ${.MAKE.OS:NIRIX*} == "" BROKEN_TESTS+= \ cmd-interrupt \ deptgt-interrupt \ @@ -576,6 +567,9 @@ SED_CMDS.directive-include-guard= \ -e '/^ParseDependency/d' \ -e '/^ParseEOF:/d' SED_CMDS.export= -e '/^[^=_A-Za-z0-9]*=/d' +.if ${.MAKE.OS:NCygwin} == "" +SED_CMDS.export+= -e '/^WINDIR=/d' -e '/^SYSTEMROOT=/d' +.endif SED_CMDS.export-all= ${SED_CMDS.export} SED_CMDS.export-env= ${SED_CMDS.export} SED_CMDS.cmdline= -e 's,uid${.MAKE.UID}/,,' @@ -628,7 +622,7 @@ SED_CMDS.var-op-shell+= ${STD_SED_CMDS.shell} SED_CMDS.var-op-shell+= -e '/command/s,No such.*,not found,' SED_CMDS.var-op-shell+= ${STD_SED_CMDS.white-space} SED_CMDS.vardebug+= -e 's,${.SHELL},</path/to/shell>,' -SED_CMDS.varmod-mtime+= -e "s,': .*,': <ENOENT>," +SED_CMDS.varmod-mtime+= -e "s,\(.*\)': .*,\1': <ENOENT>," SED_CMDS.varmod-subst-regex+= ${STD_SED_CMDS.regex} SED_CMDS.varparse-errors+= ${STD_SED_CMDS.timestamp} SED_CMDS.varname-dot-make-meta-ignore_filter+= ${SED_CMDS.meta-ignore} @@ -658,8 +652,9 @@ unexport-env.rawout: export.mk # In tests that use the debugging option -dd, ignore debugging output that is # only logged in -DCLEANUP mode. -STD_SED_CMDS.dd= -e '/^OpenDirs_Done:/d' -STD_SED_CMDS.dd+= -e '/^CachedDir /d' +STD_SED_CMDS.dd= -e '/^OpenDirs_Done:/d' +STD_SED_CMDS.dd+= -e '/^CachedDir /d' +STD_SED_CMDS.dd+= -e 's, ${DEFSYSPATH:U/usr/share/mk} , <defsyspath> ,' # Omit details such as process IDs from the output of the -dg1 option. STD_SED_CMDS.dg1= -e '/\#.* \.$$/d' @@ -765,12 +760,10 @@ TOOL_TR?= tr TOOL_DIFF?= diff DIFF_FLAGS?= -u -.if defined(.PARSEDIR) # ensure consistent results from sort(1) LC_ALL= C LANG= C .export LANG LC_ALL -.endif .if ${.MAKE.MODE:Unormal:Mmeta} != "" # we don't need the noise |