Import bmake-20240309
Intersting/relevant changes since bmake-20240108
ChangeLog since bmake-20240108
2024-03-10 Simon J Gerraty <sjg@beast.crufty.net>
* boot-strap: tests can take a long time; use a cookie to
skip them if bmake has not been updated since tests last
ran successfully.
* Makefile: Cygwin handles MANTARGET man
* unit-tests/Makefile: set BROKEN_TESTS for Cygwin
2024-03-09 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240309
Merge with NetBSD make, pick up
o set .ERROR_EXIT to the exit status of .ERROR_TARGET
this allows a .ERROR target to ignore the case of
.ERROR_EXIT==6 which just means that the build actually
failed somewhere else.
2024-03-04 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240303
* var.c: on IRIX we need both inttypes.h and stdint.h
2024-03-01 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240301
Merge with NetBSD make, pick up
o export variables with value from target scope
when appropriate.
2024-02-12 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240212
Merge with NetBSD make, pick up
o remove unneeded conditional-compilation toggles
INCLUDES, LIBRARIES, POSIX, SYSVINCLUDE, SYSVVARSUB,
GMAKEEXPORT NO_REGEX and SUNSHCMD
* configure.in: add check for regex.h
* var.c: replace use of NO_REGEX with HAVE_REGEX_H
2024-02-04 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240204
Merge with NetBSD make, pick up
o var.c: fix some lint (-dL) mode parsing issues
2024-02-02 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION: (_MAKE_VERSION): 20240202
Merge with NetBSD make, pick up
o make.1: note that arg to :D and :U can be empty
o var.c: $$ is not a parse error when .MAKE.SAVE_DOLLARS=no
mk/ChangeLog since bmake-20240108
2024-03-09 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240309
* meta.sys.mk: _metaError: if .ERROR_EXIT == 6, we do not
want to save the .ERROR_META_FILE
2024-02-20 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240220
* sys.dirdeps.mk, dirdeps-targets.mk, init.mk:
do not set .MAIN: dirdeps in sys.dirdeps.mk
dirdeps-targets.mk will do that for top-level builds
and init.mk will do it for others.
This allows a Makefile which has no need of 'dirdeps' to
set .MAIN for itself and "just work".
2024-02-18 Simon J Gerraty <sjg@beast.crufty.net>
* bsd.*.mk: for makefiles that get a bsd. symlink,
use _this in multiple inclusion tags since .PARSEFILE will not
DTRT when such a makefile is included directly by Makefile and
automatically (without bsd. prefix).
Since we cannot guarantee that our sys.mk will be used, we provide
a default _this in each makefile that gets a bsd. prefix such that
the value is the same regardless of bsd. prefix.
* subdir.mk: drop the !target guard on $SUBDIR_TARGETS
2024-02-12 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240212
* SPDX-License-Identifier: BSD-2-Clause
Add SPDX-License-Identifier to inidicate that I consider
my copyright on any of these makefiles equivalent to BSD-2-Clause
* autoconf.mk: allow for configure.ac as currently recommended
* subdir.mk: support @auto
which is replaced with each subdir that
has a [Mm]akefile.
* subdir.mk: include local.subdir.mk if it exists.
* subdir.mk: rework to handle .WAIT
2024-02-11 Simon J Gerraty <sjg@beast.crufty.net>
* subdir.mk: _SUBDIRUSE report the target we are entering subdirs for.
2024-02-10 Simon J Gerraty <sjg@beast.crufty.net>
* prog.mk: treat empty SRCS the same as undefined
2024-02-02 Simon J Gerraty <sjg@beast.crufty.net>
* Avoid undefined errors in lint (-dL) mode
* man.mk (CMT2DOC_FLAGS): note that -mm does mdoc(7)
2024-01-28 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240128
* FILES: add ccm.dep.mk for C++ modules
add suffixes.mk for common location for generic SUFFIX rules.
* auto.dep.mk autodep.mk meta.autodep.mk: include ccm.dep.mk
replace OBJ_EXTENSIONS with OBJ_SUFFIXES
* autodep.mk: leverage CXX_SUFFIXES for __depsrcs
and update style (spaces around = etc)
* init.mk: add OBJS_SRCS_FILTER to filter SRCS when
setting OBJS
* meta2deps.py: handle multiple ./ embedded in path better.
2024-03-14 02:14:41 +00:00
|
|
|
# SPDX-License-Identifier: BSD-2-Clause
|
|
|
|
#
|
|
|
|
# $Id: sys.clean-env.mk,v 1.26 2024/02/17 17:26:57 sjg Exp $
|
2013-01-31 16:44:23 +00:00
|
|
|
#
|
|
|
|
# @(#) Copyright (c) 2009, Simon J. Gerraty
|
|
|
|
#
|
|
|
|
# This file is provided in the hope that it will
|
|
|
|
# be of use. There is absolutely NO WARRANTY.
|
|
|
|
# Permission to copy, redistribute or otherwise
|
2020-09-05 16:11:04 +00:00
|
|
|
# use this file is hereby granted provided that
|
2013-01-31 16:44:23 +00:00
|
|
|
# the above copyright notice and this notice are
|
2020-09-05 16:11:04 +00:00
|
|
|
# left intact.
|
|
|
|
#
|
2013-01-31 16:44:23 +00:00
|
|
|
# Please send copies of changes and bug-fixes to:
|
|
|
|
# sjg@crufty.net
|
|
|
|
#
|
|
|
|
|
|
|
|
# This makefile would normally be included by sys.env.mk
|
|
|
|
|
|
|
|
# The variables used by this makefile include:
|
|
|
|
#
|
|
|
|
# MAKE_ENV_SAVE_VAR_LIST
|
|
|
|
# The actuall list of variables from the environment that will be
|
|
|
|
# preserved.
|
|
|
|
# MAKE_ENV_SAVE_PREFIX_LIST
|
|
|
|
# A list of prefixes to match against the environment - the results
|
|
|
|
# are added to MAKE_ENV_SAVE_VAR_LIST after being filtered by...
|
|
|
|
# MAKE_ENV_SAVE_EXCLUDE_LIST
|
|
|
|
# A list of words or patterns which is turned into a list of :N
|
|
|
|
# modifiers.
|
|
|
|
|
|
|
|
.if ${.MAKE.LEVEL} == 0 && ${MAKE_VERSION} >= 20100606
|
|
|
|
# We save any env var that starts with the words in MAKE_ENV_SAVE_PREFIX_LIST.
|
|
|
|
# This gets expanded to an egrep expression like '^(A|B|C...)'
|
|
|
|
# and added to MAKE_ENV_SAVE_VAR_LIST below.
|
|
|
|
# If any of these end up being too greedy, MAKE_ENV_SAVE_EXCLUDE_LIST
|
|
|
|
# can be used to filter.
|
|
|
|
MAKE_ENV_SAVE_PREFIX_LIST += \
|
|
|
|
CCACHE \
|
|
|
|
CVS \
|
|
|
|
DEBUG \
|
|
|
|
DISTCC \
|
|
|
|
HOST \
|
|
|
|
MACHINE \
|
|
|
|
MAKE \
|
|
|
|
MK \
|
|
|
|
NEED_ \
|
|
|
|
SB_ \
|
|
|
|
SSH \
|
|
|
|
SVN \
|
|
|
|
USE_ \
|
|
|
|
WITH_ \
|
|
|
|
WITHOUT_ \
|
|
|
|
|
|
|
|
|
|
|
|
# This could be a list of vars or patterns to explicitly exclude.
|
2022-02-05 20:03:50 +00:00
|
|
|
MAKE_ENV_SAVE_EXCLUDE_LIST += _
|
2013-01-31 16:44:23 +00:00
|
|
|
|
|
|
|
# This is the actual list that we will save
|
2020-09-05 16:11:04 +00:00
|
|
|
# HOME is probably something worth clobbering eg.
|
2013-01-31 16:44:23 +00:00
|
|
|
# HOME=/var/empty
|
|
|
|
MAKE_ENV_SAVE_VAR_LIST += \
|
|
|
|
HOME \
|
|
|
|
LOGNAME \
|
|
|
|
OBJROOT \
|
|
|
|
OBJTOP \
|
|
|
|
PATH \
|
|
|
|
SB \
|
|
|
|
SRCTOP \
|
|
|
|
USER \
|
|
|
|
${_env_vars:${MAKE_ENV_SAVE_EXCLUDE_LIST:${M_ListToSkip}}}
|
|
|
|
|
2023-01-28 00:23:54 +00:00
|
|
|
_env_vars != env | ${EGREP:Uegrep} '^(${MAKE_ENV_SAVE_PREFIX_LIST:ts|})' | sed 's,=.*,,'; echo
|
2013-01-31 16:44:23 +00:00
|
|
|
|
|
|
|
_export_list =
|
|
|
|
.for v in ${MAKE_ENV_SAVE_VAR_LIST:O:u}
|
|
|
|
.if defined($v)
|
|
|
|
_export_list += $v
|
|
|
|
# Save current value
|
|
|
|
$v := ${$v}
|
|
|
|
.endif
|
|
|
|
.endfor
|
|
|
|
|
|
|
|
# Now, clobber the environment
|
|
|
|
.unexport-env
|
|
|
|
|
|
|
|
# This is a list of vars that we handle specially below
|
|
|
|
_tricky_env_vars = MAKEOBJDIR OBJTOP
|
|
|
|
# Export our selection - sans tricky ones
|
|
|
|
.export ${_export_list:${_tricky_env_vars:${M_ListToSkip}}}
|
|
|
|
|
|
|
|
# This next bit may need tweaking
|
|
|
|
# if you don't happen to like the way I set it.
|
|
|
|
.if defined(MAKEOBJDIR)
|
|
|
|
# We are going to set this to the equivalent of the shell's
|
|
|
|
# MAKEOBJDIR='${.CURDIR:S,${SRCTOP},${OBJTOP},}'
|
|
|
|
_srctop := ${SRCTOP:U${SB_SRC:U${SB}/src}}
|
|
|
|
_objroot := ${OBJROOT:U${SB_OBJROOT:U${SB}/${SB_OBJPREFIX}}}
|
2016-03-11 00:37:02 +00:00
|
|
|
.if ${MAKE_VERSION} < 20160218
|
2013-01-31 16:44:23 +00:00
|
|
|
_objtop := ${OBJTOP:U${_objroot}${MACHINE}}
|
|
|
|
# Take care of ${MACHINE}
|
2017-11-01 23:16:32 +00:00
|
|
|
.if ${MACHINE:Nhost*} == "" || ${OBJTOP} == ${HOST_OBJTOP:Uno}
|
2013-01-31 16:44:23 +00:00
|
|
|
OBJTOP = ${_objtop:S,${HOST_TARGET}$,\${MACHINE},}
|
|
|
|
.else
|
|
|
|
OBJTOP = ${_objtop:S,${MACHINE}$,\${MACHINE},}
|
|
|
|
.endif
|
|
|
|
# Export like this
|
|
|
|
MAKEOBJDIR = $${.CURDIR:S,${_srctop},$${OBJTOP},}
|
|
|
|
#.info ${MAKE_SAVE_ENV_VARS _srctop _objroot _objtop OBJTOP MAKEOBJDIR:L:@v@${.newline}$v=${$v}@}
|
|
|
|
|
|
|
|
# Export these as-is, and do not track...
|
|
|
|
# otherwise the environment will be ruined when we evaluate them below.
|
|
|
|
.export-env ${_tricky_env_vars}
|
|
|
|
|
|
|
|
# Now evaluate for ourselves
|
|
|
|
.for v in ${_tricky_env_vars}
|
|
|
|
$v := ${$v}
|
|
|
|
.endfor
|
2016-03-11 00:37:02 +00:00
|
|
|
.else
|
2022-02-05 20:03:50 +00:00
|
|
|
# we cannot rely on the '$$' trick (depending on .MAKE.SAVE_DOLLARS)
|
2016-03-11 00:37:02 +00:00
|
|
|
# but we can export a literal (unexpanded) value
|
|
|
|
SRCTOP := ${_srctop}
|
|
|
|
OBJROOT := ${_objroot}
|
|
|
|
OBJTOP = ${OBJROOT}${MACHINE}
|
|
|
|
MAKEOBJDIR = ${.CURDIR:S,${SRCTOP},${OBJTOP},}
|
|
|
|
.export-literal SRCTOP OBJROOT ${_tricky_env_vars}
|
|
|
|
.endif
|
2013-01-31 16:44:23 +00:00
|
|
|
#.info ${_tricky_env_vars:@v@${.newline}$v=${$v}@}
|
2016-03-11 00:37:02 +00:00
|
|
|
#showenv:
|
2023-01-28 00:23:54 +00:00
|
|
|
# @env | ${EGREP:Uegrep} 'OBJ|SRC'
|
2013-01-31 16:44:23 +00:00
|
|
|
.endif # MAKEOBJDIR
|
|
|
|
.endif # level 0
|