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.
109 lines
2.7 KiB
Makefile
109 lines
2.7 KiB
Makefile
# SPDX-License-Identifier: BSD-2-Clause
|
|
#
|
|
# $Id: jobs.mk,v 1.17 2024/02/17 17:26:57 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
|
|
#
|
|
|
|
# This makefile is used by top-level makefile.
|
|
# With the following:
|
|
#
|
|
# .if make(*-jobs)
|
|
# .include <jobs.mk>
|
|
# .endif
|
|
#
|
|
#
|
|
# Then if you do:
|
|
#
|
|
# mk target-jobs
|
|
#
|
|
# We will run:
|
|
#
|
|
# ${MAKE} -j${JOB_MAX} target > ${JOB_LOGDIR}/target.log 2>&1
|
|
#
|
|
# JOB_MAX should be something like 1.2 - 1.5 times the number of
|
|
# available CPUs.
|
|
# If bmake sets .MAKE.JOBS.C=yes we can use -jC and
|
|
# JOB_MAX defaults to JOB_MAX_C (default 1.33C).
|
|
# Otherwise we use 8.
|
|
#
|
|
|
|
now_utc ?= ${%s:L:localtime}
|
|
.if !defined(start_utc)
|
|
start_utc := ${now_utc}
|
|
.endif
|
|
|
|
.if make(*-jobs)
|
|
.info ${.newline}${TIME_STAMP} Start ${.TARGETS}
|
|
|
|
JOB_LOGDIR ?= ${SRCTOP:H}
|
|
JOB_LOG = ${JOB_LOGDIR}/${.TARGET:S,-jobs,,:S,/,_,g}.log
|
|
JOB_LOG_GENS ?= 4
|
|
# we like to rotate logs
|
|
.if empty(NEWLOG_SH)
|
|
.for d in ${.SYSPATH:U${.PARSEDIR}:@x@$x $x/scripts@}
|
|
.if exists($d/newlog.sh)
|
|
NEWLOG_SH := $d/newlog.sh
|
|
.if ${MAKE_VERSION} > 20220924
|
|
.break
|
|
.endif
|
|
.endif
|
|
.endfor
|
|
.if empty(NEWLOG_SH)
|
|
.ifdef M_whence
|
|
NEWLOG_SH := ${newlog.sh:L:${M_whence}}
|
|
.else
|
|
NEWLOG_SH := ${(type newlog.sh) 2> /dev/null:L:sh:M/*}
|
|
.endif
|
|
.endif
|
|
.endif
|
|
.if !empty(NEWLOG_SH) && exists(${NEWLOG_SH})
|
|
NEWLOG := sh ${NEWLOG_SH}
|
|
JOB_NEWLOG_ARGS ?= -S -n ${JOB_LOG_GENS}
|
|
.else
|
|
NEWLOG = :
|
|
.endif
|
|
|
|
.if ${.MAKE.JOBS:U0} > 0
|
|
JOB_MAX = ${.MAKE.JOBS}
|
|
.else
|
|
# This should be derrived from number of cpu's
|
|
.if ${.MAKE.JOBS.C:Uno} == "yes"
|
|
# 1.2 - 1.5 times nCPU works well on most machines that support -jC
|
|
# if the factor is floating point, the C suffix isn't needed
|
|
JOB_MAX_C ?= 1.33
|
|
JOB_MAX ?= ${JOB_MAX_C}
|
|
.endif
|
|
JOB_MAX ?= 8
|
|
JOB_ARGS += -j${JOB_MAX}
|
|
.endif
|
|
|
|
# we need to reset .MAKE.LEVEL to 0 so that
|
|
# build orchestration works as expected (DIRDEPS_BUILD)
|
|
${.TARGETS:M*-jobs}:
|
|
@${NEWLOG} ${JOB_NEWLOG_ARGS} ${JOB_LOG}
|
|
@echo "${TIME_STAMP} Start ${.TARGET:S,-jobs,,} ${JOB_ARGS} ${JOB_LOG_START} log=${JOB_LOG}" | tee ${JOB_LOG}
|
|
@cd ${.CURDIR} && env MAKELEVEL=0 \
|
|
${.MAKE} ${JOB_ARGS} _TARGETS=${.TARGET:S,-jobs,,} ${.TARGET:S,-jobs,,} >> ${JOB_LOG} 2>&1
|
|
|
|
.endif
|
|
|
|
.END: _build_finish
|
|
.ERROR: _build_failed
|
|
|
|
_build_finish: .NOMETA
|
|
@echo "${TIME_STAMP} Finished ${.TARGETS} seconds=`expr ${now_utc} - ${start_utc}`"
|
|
|
|
_build_failed: .NOMETA
|
|
@echo "${TIME_STAMP} Failed ${.TARGETS} seconds=`expr ${now_utc} - ${start_utc}`"
|