mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
a6b892e1c7
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.
142 lines
3 KiB
Bash
Executable file
142 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
# NAME:
|
|
# stage-install.sh - wrapper around install
|
|
#
|
|
# SYNOPSIS:
|
|
# stage-install.sh [variable="value"] "args" "dest"
|
|
#
|
|
# DESCRIPTION:
|
|
# This script is a wrapper around the normal install(1).
|
|
# Its role is to add '.dirdep' files to the destination.
|
|
# The variables we might use are:
|
|
#
|
|
# INSTALL
|
|
# Path to actual install(1), default is
|
|
# $REAL_INSTALL
|
|
#
|
|
# OBJDIR
|
|
# Path to the dir where '.dirdep' was generated,
|
|
# default is '.'
|
|
#
|
|
# _DIRDEP
|
|
# Path to actual '.dirdep' file, default is
|
|
# $OBJDIR/.dirdep
|
|
#
|
|
# The "args" and "dest" are passed as is to install(1), and if a
|
|
# '.dirdep' file exists it will be linked or copied to each
|
|
# "file".dirdep placed in "dest" or "dest".dirdep if it happed
|
|
# to be a file rather than a directory.
|
|
#
|
|
# Before we run install(1), we check if "dest" needs to be a
|
|
# directory (more than one file in "args") and create it
|
|
# if necessary.
|
|
#
|
|
# SEE ALSO:
|
|
# meta.stage.mk
|
|
#
|
|
|
|
# RCSid:
|
|
# $Id: stage-install.sh,v 1.11 2024/02/17 17:26:57 sjg Exp $
|
|
#
|
|
# SPDX-License-Identifier: BSD-2-Clause
|
|
#
|
|
# @(#) Copyright (c) 2013-2020, 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.
|
|
#
|
|
# Please send copies of changes and bug-fixes to:
|
|
# sjg@crufty.net
|
|
#
|
|
|
|
INSTALL=${REAL_INSTALL:-install}
|
|
OBJDIR=.
|
|
|
|
while :
|
|
do
|
|
case "$1" in
|
|
*=*) eval "$1"; shift;;
|
|
*) break;;
|
|
esac
|
|
done
|
|
|
|
# get last entry from "$@" without side effects
|
|
last_entry() {
|
|
while [ $# -gt 8 ]
|
|
do
|
|
shift 8
|
|
done
|
|
eval last=\$$#
|
|
echo $last
|
|
}
|
|
|
|
# mkdir $dest if needed (more than one file)
|
|
mkdir_if_needed() {
|
|
(
|
|
lf=
|
|
while [ $# -gt 8 ]
|
|
do
|
|
shift 4
|
|
done
|
|
for f in "$@"
|
|
do
|
|
[ -f $f ] || continue
|
|
[ $f = $dest ] && continue
|
|
if [ -n "$lf" ]; then
|
|
# dest must be a directory
|
|
mkdir -p $dest
|
|
break
|
|
fi
|
|
lf=$f
|
|
done
|
|
)
|
|
}
|
|
|
|
args="$@"
|
|
dest=`last_entry "$@"`
|
|
case " $args " in
|
|
*" -d "*) ;;
|
|
*) [ -e $dest ] || mkdir_if_needed "$@";;
|
|
esac
|
|
|
|
# if .dirdep doesn't exist, just run install and be done
|
|
_DIRDEP=${_DIRDEP:-$OBJDIR/.dirdep}
|
|
[ -s $_DIRDEP ] && EXEC= || EXEC=exec
|
|
$EXEC $INSTALL "$@" || exit 1
|
|
|
|
# from meta.stage.mk
|
|
LnCp() {
|
|
rm -f $2 2> /dev/null
|
|
ln $1 $2 2> /dev/null || cp -p $1 $2
|
|
}
|
|
|
|
StageDirdep() {
|
|
t=$1
|
|
if [ -s $t.dirdep ]; then
|
|
cmp -s $_DIRDEP $t.dirdep && return
|
|
case "${STAGE_CONFLICT:-error}" in
|
|
[Ee]*) STAGE_CONFLICT=ERROR action=exit;;
|
|
*) STAGE_CONFLICT=WARNING action=: ;;
|
|
esac
|
|
echo "$STAGE_CONFLICT: $t installed by `cat $t.dirdep` not `cat $_DIRDEP`" >&2
|
|
$action 1
|
|
fi
|
|
LnCp $_DIRDEP $t.dirdep || exit 1
|
|
}
|
|
|
|
if [ -f $dest ]; then
|
|
# a file, there can be only one .dirdep needed
|
|
StageDirdep $dest
|
|
elif [ -d $dest ]; then
|
|
for f in $args
|
|
do
|
|
test -f $f || continue
|
|
StageDirdep $dest/${f##*/}
|
|
done
|
|
fi
|