diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2025-12-03 17:57:57 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2025-12-03 17:57:57 +0000 |
| commit | 638c66de4a0faa4c2e815e81cd4021c2387c7e0f (patch) | |
| tree | 501a9007f873e948a69c658104c34838ddaac038 /mk/meta.stage.mk | |
| parent | 787302bde4d89279180303b753eb73b9bc6820b9 (diff) | |
Import bmake-20251111vendor/NetBSD/bmake/20251111vendor/NetBSD/bmake
Intersting/relevant changes since bmake-20250804
ChangeLog since bmake-20250804
2025-11-15 Simon J Gerraty <sjg@beast.crufty.net>
* boot-strap: unset more things from env and save a copy
to env.out for debugging.
2025-11-12 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20251111
Merge with NetBSD make, pick up
o var.c: add :sh1 which only evaluates command on first reference.
2025-11-11 Simon J Gerraty <sjg@beast.crufty.net>
* configure.in: Force filemon=no for Cygwin and MINGW64_NT
2025-11-10 Simon J Gerraty <sjg@beast.crufty.net>
* unit-tests/Makefile: handle MINGW64_NT
mark some tests broken, filter others as per Cygwin.
2025-10-23 Simon J Gerraty <sjg@beast.crufty.net>
* make.1: document MAKE_VERSION.
2025-10-22 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20251022
* configure.in: Add a check that lua is version 5.2 or later
if not we want to skip running check-expect.lua
2025-09-16 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20250916
Merge with NetBSD make, pick up
o var.c: avoid compiler warning from hexdigits
mk/ChangeLog since bmake-20250804
2025-11-18 Simon J Gerraty <sjg@beast.crufty.net>
* sys.vars.mk: set MAKE_POSIX_SHELL to 1 if .SHELL is POSIX, 0 if not.
set isPOSIX_SHELL for use in target scripts.
* meta.stage.mk: set MAKE_POSIX_SHELL if needed.
* install-new.mk: use ${isPOSIX_SHELL:Ufalse} to see if we can
avoid running 'expr'.
* install-new.mk: Allow use of cp or mv - controlled by CPMV_OP
(default mv).
2025-11-13 Simon J Gerraty <sjg@beast.crufty.net>
* sys.vars.mk: add M_sh1 so we can handle older bmake that does
not support :sh1
2025-11-11 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20251111
* meta2deps.sh: reset some vars for each new meta file
set meta_file to path of meta file.
If meta2deps appears in DEBUG_SH set -x.
2025-09-16 Simon J Gerraty <sjg@beast.crufty.net>
* options.mk: Add OPTIONS_DEFAULT_DEPENDENT_REQUIRED of the form
OPTION/REQUIRED[/VALUE]
if OPTION is $VALUE (default is "yes"), then REQUIRED must be too.
We add OPTIONS_DEFAULT_DEPENDENT_REQUIRED (sans any /{yes,no}) to
OPTIONS_DEFAULT_DEPENDENT so DEPENDENT/REQUIRED follow the same
processing.
Also add OPTIONS_FORCED_VALUES of the form OPTION/{yes,no}
we add any OPTIONS_FORCED_NO and OPTIONS_FORCED_YES before
processing.
Simplify the processing of OPTIONS_DEFAULT_VALUES and
OPTIONS_DEFAULT_DEPENDENT by splitting the tuples and use two
iterator variables in the .for loops.
2025-08-09 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20250808
* replace sjg license with just BSD-2-Clause SPDX tag
Diffstat (limited to 'mk/meta.stage.mk')
| -rw-r--r-- | mk/meta.stage.mk | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/mk/meta.stage.mk b/mk/meta.stage.mk index 97e4dce83e5d..c98f0c251c67 100644 --- a/mk/meta.stage.mk +++ b/mk/meta.stage.mk @@ -1,15 +1,8 @@ -# SPDX-License-Identifier: BSD-2-Clause -# -# $Id: meta.stage.mk,v 1.71 2025/03/14 20:28:42 sjg Exp $ +# $Id: meta.stage.mk,v 1.74 2025/11/19 17:44:15 sjg Exp $ # # @(#) Copyright (c) 2011-2025, 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 -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. +# SPDX-License-Identifier: BSD-2-Clause # # Please send copies of changes and bug-fixes to: # sjg@crufty.net @@ -38,14 +31,19 @@ CLEANFILES+= .dirdep @echo '${_dirdep}' > $@ .endif -.if defined(NO_POSIX_SHELL) || ${type printf:L:sh:Mbuiltin} == "" -_stage_file_basename = `basename $$f` -_stage_file_dirname = `dirname $$f` -_stage_target_dirname = `dirname $$t` -.else +.ifndef MAKE_POSIX_SHELL +MAKE_POSIX_SHELL != (echo $${PATH%:*}) > /dev/null 2>&1 && echo 1 || echo 0 +.export MAKE_POSIX_SHELL +.endif + +.if ${MAKE_POSIX_SHELL} _stage_file_basename = $${f\#\#*/} _stage_file_dirname = $${f%/*} _stage_target_dirname = $${t%/*} +.else +_stage_file_basename = `basename $$f` +_stage_file_dirname = `dirname $$f` +_stage_target_dirname = `dirname $$t` .endif _OBJROOT ?= ${OBJROOT:U${OBJTOP:H}} |