mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
507951f550
Intersting/relevant changes since bmake-20240309
ChangeLog since bmake-20240309
2024-04-30 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240430
Merge with NetBSD make, pick up
o main.c: ensure '.include <makefile>' respects MAKESYSPATH.
Dir_FindFile will search .CURDIR first unless ".DOTLAST" is seen.
2024-04-28 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240428
Merge with NetBSD make, pick up
o simplify freeing of lists
o arch.c: trim pointless comments
o var.c: delay variable assignments until actually needed
don't reallocate memory after evaluating an expression, result is
almost always short-lived.
2024-04-26 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240426
Merge with NetBSD make, pick up
o job.c: in debug output, print the directory in which a job
failed at same time as failed target so it is more easily found in
build log.
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240424
Merge with NetBSD make, pick up
o clean up comments, code and tests
2024-04-23 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240422
Merge with NetBSD make, pick up
o var.c: avoid LazyBuf for :*time modifiers.
LazyBuf's are not nul terminated so not suitable for passing to
functions that expect that. These modifiers are used sparingly so
an extra allocation is not a problem.
2024-04-20 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240420
Merge with NetBSD make, pick up
o provide more context information for parse/evaluate errors
2024-04-14 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240414
Merge with NetBSD make, pick up
o parse.c: print -dp debug info earlier so we see which
.if or .for line is being parsed.
2024-04-04 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240404
Merge with NetBSD make, pick up
o fix some unit tests for Cygwin
o parse.c: exit immediately after reading a null byte from a makefile
* fix generation of bmake.cat1
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240314
Add/Improve support for Cygwin
o uname -s output isn't useful so allow configure to
set FORCE_MAKE_OS - to force the value of .MAKE.OS
and use Cygwin which matches uname -o
o fix some unit-tests for Cygwin
* configure.in: use_makefile=no for Cygwin et al.
NOTE: bmake does not support Cygwin and likely never will,
mk/ChangeLog since bmake-20240309
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* meta.autodep.mk: do not override start_utc
2024-04-18 Simon J Gerraty <sjg@beast.crufty.net>
* sys.dirdeps.mk: set defaults for DEP_* at level 0 too.
These help when first include of Makefile.depend happens in a leaf
dir.
* install-mk (MK_VERSION): 20240414
2024-04-09 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240408
* init.mk: allow for _ as well as . to join V
and Q from QUALIFIED_VAR_LIST and VAR_QUALIFIER_LIST.
* progs.mk: avoid overlap between PROG_VARS and
init.mk's QUALIFIED_VAR_LIST since PROG would also
match its VAR_QUALIFIER_LIST,
libs.mk does not have the same issue.
* subdir.mk: _SUBDIRUSE for realinstall should run install
remove include of ${.CURDIR}/Makefile.inc that can be done via
local.subdir.mk where needed
* own.mk: do not conflict with man.mk
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240314
* add sys/Cygwin.mk from Christian Franke
206 lines
5.3 KiB
Makefile
206 lines
5.3 KiB
Makefile
# SPDX-License-Identifier: BSD-2-Clause
|
|
#
|
|
# $Id: sys.dirdeps.mk,v 1.15 2024/04/18 17:18:31 sjg Exp $
|
|
#
|
|
# @(#) Copyright (c) 2012-2023, 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
|
|
#
|
|
|
|
# Originally DIRDEPS_BUILD and META_MODE were the same thing.
|
|
# So, much of this was done in *meta.sys.mk and local*mk
|
|
# but properly belongs here.
|
|
|
|
# Include from [local.]sys.mk - if doing DIRDEPS_BUILD
|
|
# we should not be here otherwise
|
|
MK_DIRDEPS_BUILD ?= yes
|
|
# these are all implied
|
|
MK_AUTO_OBJ ?= yes
|
|
MK_META_MODE ?= yes
|
|
MK_STAGING ?= yes
|
|
|
|
_PARSEDIR ?= ${.PARSEDIR:tA}
|
|
|
|
.-include <local.sys.dirdeps.env.mk>
|
|
|
|
.if ${.MAKE.LEVEL} == 0
|
|
# make sure dirdeps target exists and do it first
|
|
# init.mk will set .MAIN to 'dirdeps' if appropriate
|
|
# as will dirdeps-targets.mk for top-level builds.
|
|
# This allows a Makefile to have more control.
|
|
dirdeps:
|
|
.NOPATH: dirdeps
|
|
all: dirdeps .WAIT
|
|
.endif
|
|
|
|
.if empty(SRCTOP)
|
|
# fallback assumes share/mk!
|
|
SRCTOP := ${SB_SRC:U${.PARSEDIR:tA:H:H}}
|
|
.export SRCTOP
|
|
.endif
|
|
|
|
# fake SB if not using mk wrapper
|
|
# SB documented at http://www.crufty.net/sjg/docs/sb-tools.htm
|
|
.if !defined(SB)
|
|
SB := ${SRCTOP:H}
|
|
.export SB
|
|
.endif
|
|
|
|
.if empty(OBJROOT)
|
|
OBJROOT := ${SB_OBJROOT:U${MAKEOBJDIRPREFIX:U${SB}/obj}/}
|
|
.export OBJROOT
|
|
.endif
|
|
# we expect OBJROOT to end with / (- can work too)
|
|
.if ${OBJROOT:M*[/-]} == ""
|
|
OBJROOT := ${OBJROOT}/
|
|
.endif
|
|
|
|
.if empty(STAGE_ROOT)
|
|
STAGE_ROOT ?= ${OBJROOT}stage
|
|
.export STAGE_ROOT
|
|
.endif
|
|
|
|
# We should be included before meta.sys.mk
|
|
# If TARGET_SPEC_VARS is other than just MACHINE
|
|
# it should be set by now.
|
|
# TARGET_SPEC must not contain any '.'s.
|
|
TARGET_SPEC_VARS ?= MACHINE
|
|
|
|
.if ${TARGET_SPEC:Uno:M*,*} != ""
|
|
# deal with TARGET_SPEC from env
|
|
_tspec := ${TARGET_SPEC:S/,/ /g}
|
|
.for i in ${TARGET_SPEC_VARS:${M_RANGE:Urange}}
|
|
${TARGET_SPEC_VARS:[$i]} := ${_tspec:[$i]}
|
|
.endfor
|
|
# We need to stop that TARGET_SPEC affecting any submakes
|
|
TARGET_SPEC=
|
|
# so export but do not track
|
|
.export-env TARGET_SPEC
|
|
.export ${TARGET_SPEC_VARS}
|
|
.for v in ${TARGET_SPEC_VARS:O:u}
|
|
.if empty($v)
|
|
.undef $v
|
|
.endif
|
|
.endfor
|
|
.endif
|
|
|
|
# Now make sure we know what TARGET_SPEC is
|
|
# as we may need it to find Makefile.depend*
|
|
.if ${MACHINE:Mhost*} != ""
|
|
# host is special
|
|
TARGET_SPEC = ${MACHINE}
|
|
.else
|
|
TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,}
|
|
.endif
|
|
|
|
.if ${TARGET_SPEC_VARS:[#]} > 1
|
|
TARGET_SPEC_VARSr := ${TARGET_SPEC_VARS:[-1..1]}
|
|
# alternatives might be
|
|
# TARGET_OBJ_SPEC = ${TARGET_SPEC_VARSr:@v@${$v:U}@:ts/}
|
|
# TARGET_OBJ_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts/}
|
|
TARGET_OBJ_SPEC ?= ${TARGET_SPEC_VARS:@v@${$v:U}@:ts.}
|
|
.else
|
|
TARGET_OBJ_SPEC ?= ${MACHINE}
|
|
.endif
|
|
|
|
MAKE_PRINT_VAR_ON_ERROR += ${TARGET_SPEC_VARS}
|
|
|
|
.if !defined(MACHINE0)
|
|
# it can be handy to know which MACHINE kicked off the build
|
|
# for example, if using Makefild.depend for multiple machines,
|
|
# allowing only MACHINE0 to update can keep things simple.
|
|
MACHINE0 := ${MACHINE}
|
|
.export MACHINE0
|
|
.endif
|
|
|
|
MACHINE_OBJ.host = ${HOST_TARGET}
|
|
MACHINE_OBJ.host32 = ${HOST_TARGET32}
|
|
MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC}
|
|
MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}}
|
|
|
|
# we likely want to override env for OBJTOP
|
|
.if ${MACHINE} == "host"
|
|
OBJTOP = ${HOST_OBJTOP}
|
|
.elif ${MACHINE} == "host32"
|
|
OBJTOP = ${HOST_OBJTOP32}
|
|
.else
|
|
OBJTOP = ${OBJROOT}${MACHINE_OBJDIR}
|
|
.endif
|
|
.if ${.MAKE.LEVEL} > 0
|
|
# should not change from level 1 onwards
|
|
# this only matters for cases like bmake/unit-tests
|
|
# where we do ${MAKE} -r
|
|
.export OBJTOP
|
|
.endif
|
|
|
|
.if ${MAKEOBJDIR:U:M*/*} == ""
|
|
# we do not use MAKEOBJDIRPREFIX
|
|
# though we may have used it above to initialize OBJROOT
|
|
.undef MAKEOBJDIRPREFIX
|
|
# this is what we expected in env
|
|
MAKEOBJDIR = $${.CURDIR:S,^$${SRCTOP},$${OBJTOP},}
|
|
# export that but do not track
|
|
.export-env MAKEOBJDIR
|
|
# this what we need here
|
|
MAKEOBJDIR = ${.CURDIR:S,${SRCTOP},${OBJTOP},}
|
|
.endif
|
|
|
|
STAGE_MACHINE ?= ${MACHINE_OBJDIR}
|
|
STAGE_OBJTOP ?= ${STAGE_ROOT}/${STAGE_MACHINE}
|
|
STAGE_COMMON_OBJTOP ?= ${STAGE_ROOT}/common
|
|
STAGE_HOST_OBJTOP ?= ${STAGE_ROOT}/${HOST_TARGET}
|
|
STAGE_HOST_OBJTOP32 ?= ${STAGE_ROOT}/${HOST_TARGET32}
|
|
|
|
STAGE_INCLUDEDIR ?= ${STAGE_OBJTOP}${INCLUDEDIR:U/usr/include}
|
|
STAGE_LIBDIR ?= ${STAGE_OBJTOP}${LIBDIR:U/lib}
|
|
|
|
TIME_STAMP_FMT ?= @ %s [%Y-%m-%d %T] ${:U}
|
|
DATE_TIME_STAMP ?= `date '+${TIME_STAMP_FMT}'`
|
|
TIME_STAMP ?= ${TIME_STAMP_FMT:localtime}
|
|
|
|
.if ${MK_TIME_STAMPS:Uyes} == "yes"
|
|
TRACER = ${TIME_STAMP}
|
|
ECHO_DIR = echo ${TIME_STAMP}
|
|
ECHO_TRACE = echo ${TIME_STAMP}
|
|
.endif
|
|
|
|
.if ${.CURDIR} == ${SRCTOP}
|
|
RELDIR= .
|
|
RELTOP= .
|
|
.elif ${.CURDIR:M${SRCTOP}/*}
|
|
RELDIR:= ${.CURDIR:S,${SRCTOP}/,,}
|
|
.else
|
|
RELDIR:= ${.OBJDIR:S,${OBJTOP}/,,}
|
|
.endif
|
|
RELTOP?= ${RELDIR:C,[^/]+,..,g}
|
|
RELOBJTOP?= ${RELTOP}
|
|
RELSRCTOP?= ${RELTOP}
|
|
|
|
# this does all the smarts of setting .MAKE.DEPENDFILE
|
|
.-include <sys.dependfile.mk>
|
|
|
|
.-include <local.sys.dirdeps.mk>
|
|
|
|
# check if we got anything sane
|
|
.if ${.MAKE.DEPENDFILE} == ".depend"
|
|
.undef .MAKE.DEPENDFILE
|
|
.endif
|
|
# just in case
|
|
.MAKE.DEPENDFILE ?= Makefile.depend
|
|
|
|
# Makefile.depend* often refer to DEP_MACHINE etc,
|
|
# we need defaults for both first include in a leaf dir
|
|
# and when level > 0
|
|
# so ensure DEP_* for TARGET_SPEC_VARS and RELDIR are set
|
|
.for V in ${TARGET_SPEC_VARS} RELDIR
|
|
DEP_$V ?= ${$V}
|
|
.endfor
|