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: manifest.mk,v 1.4 2024/02/17 17:26:57 sjg Exp $
|
2015-04-20 03:45:54 +00:00
|
|
|
#
|
|
|
|
|
# @(#) Copyright (c) 2014, 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
|
2015-04-20 03:45:54 +00:00
|
|
|
# the above copyright notice and this notice are
|
2020-09-05 16:11:04 +00:00
|
|
|
# left intact.
|
|
|
|
|
#
|
2015-04-20 03:45:54 +00:00
|
|
|
# Please send copies of changes and bug-fixes to:
|
|
|
|
|
# sjg@crufty.net
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# generate mtree style manifest supported by makefs in FreeBSD
|
|
|
|
|
|
|
|
|
|
# input looks like
|
|
|
|
|
# MANIFEST= my.mtree
|
|
|
|
|
# for each MANIFEST we have a list of dirs
|
|
|
|
|
# ${MANIFEST}.DIRS += bin sbin usr/bin ...
|
|
|
|
|
# for each dir we have a ${MANIFEST}.SRCS.$dir
|
|
|
|
|
# that provides the absolute path to the contents
|
2020-09-05 16:11:04 +00:00
|
|
|
# ${MANIFEST}.SRCS.bin += ${OBJTOP}/bin/sh/sh
|
2015-04-20 03:45:54 +00:00
|
|
|
# ${MANIFEST}.SYMLINKS is a list of src target pairs
|
|
|
|
|
# for each file/dir there are a number of attributes
|
|
|
|
|
# UID GID MODE FLAGS
|
|
|
|
|
# which can be set per dir, per file or we use defaults
|
2020-09-05 16:11:04 +00:00
|
|
|
# eg.
|
2015-04-20 03:45:54 +00:00
|
|
|
# MODE.sbin = 550
|
|
|
|
|
# MODE.usr/sbin = 550
|
|
|
|
|
# MODE.dirs = 555
|
|
|
|
|
# means that sbin and usr/sbin get 550 all other dirs get 555
|
|
|
|
|
# MODE.usr/bin/passwd = 4555
|
|
|
|
|
# MODE.usr/bin.files = 555
|
|
|
|
|
# MODE.usr/sbin.files = 500
|
|
|
|
|
# means passwd gets 4555 other files in usr/bin get 555 and
|
|
|
|
|
# files in usr/sbin get 500
|
|
|
|
|
# STORE defaults to basename of src and target directory
|
2020-09-05 16:11:04 +00:00
|
|
|
# but we can use
|
2015-04-20 03:45:54 +00:00
|
|
|
# ${MANIFEST}.SRCS.sbin += ${OBJTOP}/bin/sh-static/sh-static
|
|
|
|
|
# STORE.sbin/sh-static = sbin/sh
|
|
|
|
|
#
|
|
|
|
|
# the above is a little overkill but means we can easily adapt to
|
|
|
|
|
# different formats
|
|
|
|
|
|
|
|
|
|
UID.dirs ?= 0
|
|
|
|
|
GID.dirs ?= 0
|
|
|
|
|
MODE.dirs ?= 775
|
2020-09-05 16:11:04 +00:00
|
|
|
FLAGS.dirs ?=
|
2015-04-20 03:45:54 +00:00
|
|
|
|
|
|
|
|
UID.files ?= 0
|
|
|
|
|
GID.files ?= 0
|
|
|
|
|
MODE.files ?= 555
|
|
|
|
|
|
|
|
|
|
# a is attribute name d is dirname
|
|
|
|
|
M_DIR_ATTR = L:@a@$${$$a.$$d:U$${$$a.dirs}}@
|
|
|
|
|
# as above and s is set to the name we store f as
|
|
|
|
|
M_FILE_ATTR = L:@a@$${$$a.$$s:U$${$$a.$$d.files:U$${$$a.files}}}@
|
|
|
|
|
|
|
|
|
|
# this produces the body of the manifest
|
|
|
|
|
# there should typically be a header prefixed
|
|
|
|
|
_GEN_MTREE_MANIFEST_USE: .USE
|
|
|
|
|
@(${${.TARGET}.DIRS:O:u:@d@echo '$d type=dir uid=${UID:${M_DIR_ATTR}} gid=${GID:${M_DIR_ATTR}} mode=${MODE:${M_DIR_ATTR}} ${FLAGS:${M_DIR_ATTR}}';@} \
|
|
|
|
|
${${.TARGET}.DIRS:O:u:@d@${${.TARGET}.SRCS.$d:O:u:@f@echo '${s::=${STORE.$d/${f:T}:U$d/${f:T}}}$s contents="$f" type=file uid=${UID:${M_FILE_ATTR}} gid=${GID:${M_FILE_ATTR}} mode=${MODE:${M_FILE_ATTR}} ${FLAGS:${M_FILE_ATTR}}';@}@} \
|
|
|
|
|
set ${${.TARGET}.SYMLINKS}; while test $$# -ge 2; do echo "$$2 type=link link=$$1"; shift 2; done) > ${.TARGET}
|