svn commit: r305634 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Fri Sep 9 18:24:38 UTC 2016
On 9/8/16 6:21 PM, Simon J. Gerraty wrote:
> Author: sjg
> Date: Fri Sep 9 01:21:35 2016
> New Revision: 305634
> URL: https://svnweb.freebsd.org/changeset/base/305634
>
> Log:
> Update to latest dirdeps.mk
>
> Take advantage of new bmake feature to only consider Makefile.depend
> as invalidating DIRDEPS_CACHE.
>
> When bootstrapping allow more filtering via .MAKE.DEPENDFILE_BOOTSTRAP_SED
>
> Move some comments back to where they make sense.
>
> meta.sys.mk: add META_COOKIE_TOUCH and META_NOPHONY to better handle some
> targets in meta mode vs non-meta mode.
> Also use .MAKE.META.IGNORE_PATHS to ignore mtime of makefiles - which do
> not matter in meta mode.
>
> Modified:
> head/share/mk/dirdeps.mk
> head/share/mk/meta.sys.mk
>
> Modified: head/share/mk/dirdeps.mk
> ==============================================================================
> --- head/share/mk/dirdeps.mk Fri Sep 9 01:09:39 2016 (r305633)
> +++ head/share/mk/dirdeps.mk Fri Sep 9 01:21:35 2016 (r305634)
> @@ -1,5 +1,5 @@
> # $FreeBSD$
> -# $Id: dirdeps.mk,v 1.62 2016/03/16 00:11:53 sjg Exp $
> +# $Id: dirdeps.mk,v 1.73 2016/08/15 19:28:13 sjg Exp $
>
> # Copyright (c) 2010-2013, Juniper Networks, Inc.
> # All rights reserved.
> @@ -117,12 +117,17 @@ _DIRDEP_USE_LEVEL?= 0
> .if ${.MAKE.LEVEL} == ${_DIRDEP_USE_LEVEL}
> # only the first instance is interested in all this
>
> -# First off, we want to know what ${MACHINE} to build for.
> -# This can be complicated if we are using a mixture of ${MACHINE} specific
> -# and non-specific Makefile.depend*
> -
> .if !target(_DIRDEP_USE)
>
> +# do some setup we only need once
> +_CURDIR ?= ${.CURDIR}
> +_OBJDIR ?= ${.OBJDIR}
> +
> +now_utc = ${%s:L:gmtime}
> +.if !defined(start_utc)
> +start_utc := ${now_utc}
> +.endif
> +
> .if ${MAKEFILE:T} == ${.PARSEFILE} && empty(DIRDEPS) && ${.TARGETS:Uall:M*/*} != ""
> # This little trick let's us do
> #
> @@ -145,15 +150,6 @@ MK_DIRDEPS_CACHE = no
> # make sure we get the behavior we expect
> .MAKE.SAVE_DOLLARS = no
>
> -# do some setup we only need once
> -_CURDIR ?= ${.CURDIR}
> -_OBJDIR ?= ${.OBJDIR}
> -
> -now_utc = ${%s:L:gmtime}
> -.if !defined(start_utc)
> -start_utc := ${now_utc}
> -.endif
> -
> # make sure these are empty to start with
> _DEP_TARGET_SPEC =
>
> @@ -224,6 +220,10 @@ N_notmachine := ${.MAKE.DEPENDFILE_PREFE
>
> .endif # !target(_DIRDEP_USE)
>
> +# First off, we want to know what ${MACHINE} to build for.
> +# This can be complicated if we are using a mixture of ${MACHINE} specific
> +# and non-specific Makefile.depend*
> +
> # if we were included recursively _DEP_TARGET_SPEC should be valid.
> .if empty(_DEP_TARGET_SPEC)
> # we may or may not have included a dependfile yet
> @@ -386,7 +386,7 @@ BUILD_DIRDEPS ?= yes
> .if !defined(NO_DIRDEPS) && !defined(NO_DIRDEPS_BELOW)
> .if ${MK_DIRDEPS_CACHE} == "yes"
> # this is where we will cache all our work
> -DIRDEPS_CACHE?= ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.}
> +DIRDEPS_CACHE?= ${_OBJDIR:tA}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.}
>
> # just ensure this exists
> build-dirdeps:
> @@ -398,6 +398,9 @@ M_oneperline = @x@\\${.newline} $$x@
> # we do this via sub-make
> BUILD_DIRDEPS = no
>
> +# ignore anything but these
> +.MAKE.META.IGNORE_FILTER = M*/${.MAKE.DEPENDFILE_PREFIX}*
> +
> dirdeps: dirdeps-cached
> dirdeps-cached: ${DIRDEPS_CACHE} .MAKE
> @echo "${TRACER}Using ${DIRDEPS_CACHE}"
> @@ -670,7 +673,10 @@ _DEP_RELDIR := ${RELDIR}
> make(bootstrap-recurse) || \
> make(bootstrap-empty))
>
> -.if exists(${.CURDIR}/${.MAKE.DEPENDFILE:T})
> +# if we are bootstrapping create the default
> +_want = ${.CURDIR}/${.MAKE.DEPENDFILE_DEFAULT:T}
> +
> +.if exists(${_want})
> # stop here
> ${.TARGETS:Mboot*}:
> .elif !make(bootstrap-empty)
> @@ -680,12 +686,19 @@ _src != cd ${.CURDIR} && for m in ${.MAK
> .error cannot find any of ${.MAKE.DEPENDFILE_PREFERENCE:T}${.newline}Use: bootstrap-empty
> .endif
>
> -_src?= ${.MAKE.DEPENDFILE:T}
> +_src?= ${.MAKE.DEPENDFILE}
> +
> +.MAKE.DEPENDFILE_BOOTSTRAP_SED+= -e 's,${_src:E},${MACHINE},g'
>
> # just create Makefile.depend* for this dir
> bootstrap-this: .NOTMAIN
> - @echo Bootstrapping ${RELDIR}/${.MAKE.DEPENDFILE:T} from ${_src:T}
> - (cd ${.CURDIR} && sed 's,${_src:E},${MACHINE},g' ${_src} > ${.MAKE.DEPENDFILE:T})
> + @echo Bootstrapping ${RELDIR}/${_want:T} from ${_src:T}; \
> + echo You need to build ${RELDIR} to correctly populate it.
> +.if ${_src:T} != ${.MAKE.DEPENDFILE_PREFIX:T}
> + (cd ${.CURDIR} && sed ${.MAKE.DEPENDFILE_BOOTSTRAP_SED} ${_src} > ${_want})
> +.else
> + cp ${.CURDIR}/${_src:T} ${_want}
> +.endif
>
> # create Makefile.depend* for this dir and its dependencies
> bootstrap: bootstrap-recurse
> @@ -705,8 +718,8 @@ bootstrap-recurse: .NOTMAIN .MAKE
>
> # create an empty Makefile.depend* to get the ball rolling.
> bootstrap-empty: .NOTMAIN .NOMETA
> - @echo Creating empty ${RELDIR}/${.MAKE.DEPENDFILE:T}; \
> + @echo Creating empty ${RELDIR}/${_want:T}; \
> echo You need to build ${RELDIR} to correctly populate it.
> - @{ echo DIRDEPS=; echo ".include <dirdeps.mk>"; } > ${.CURDIR}/${.MAKE.DEPENDFILE:T}
> + @{ echo DIRDEPS=; echo ".include <dirdeps.mk>"; } > ${_want}
>
> .endif
>
> Modified: head/share/mk/meta.sys.mk
> ==============================================================================
> --- head/share/mk/meta.sys.mk Fri Sep 9 01:09:39 2016 (r305633)
> +++ head/share/mk/meta.sys.mk Fri Sep 9 01:21:35 2016 (r305634)
> @@ -26,6 +26,10 @@
> # absoulte path to what we are reading.
> _PARSEDIR = ${.PARSEDIR:tA}
>
> +.if !defined(SYS_MK_DIR)
> +SYS_MK_DIR := ${_PARSEDIR}
> +.endif
> +
> META_MODE += meta verbose
> .MAKE.MODE ?= ${META_MODE}
>
> @@ -110,10 +114,26 @@ _metaError: .NOMETA .NOTMAIN
>
> .endif
>
> +META_COOKIE_TOUCH=
> +# some targets need to be .PHONY in non-meta mode
> +META_NOPHONY= .PHONY
> # Are we, after all, in meta mode?
> .if ${.MAKE.MODE:Uno:Mmeta*} != ""
> MKDEP_MK = meta.autodep.mk
>
> +# we can afford to use cookies to prevent some targets
> +# re-running needlessly
> +META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}
Could you use ?= here please? I have a META_COOKIE_TOUCH in local.sys.mk
that is slightly different for handling absolute pathed cookies (with
.OBJDIR in them).
Also note that you need to remove this cookie immediately in any target
that uses it. I covered this a bit in my BSDCan presentation. The
problem is if meta mode determines that a target is outdated, then
partially rebuilds the target, then fails before touching the cookie.
The next build may not consider the target out-of-date anymore and fail
to retry.
Consider something like:
foo: foo.c
target_install:
cp foo ${DESTDIR}/usr/bin/
touch target_install
It may consider this target out-of-date due to foo rebuilding (and
detected in target_install.meta), but the cp may fail. The next build,
target_install.meta was overwritten with the failed attempt, and is now
newer than foo and still has its target_install cookie. Nothing will
cause it to retry copying, and it proceeds on with the build without
properly failing again. I hit this case in at least include/ (which
went through a lot of further changes, finally of which was the removal
of cookies in r300346) and some other cases which I don't recall the
specifics for.
> +META_NOPHONY=
> +
> +# some targets involve old pre-built targets
> +# ignore mtime of shell
> +# and mtime of makefiles does not matter in meta mode
> +.MAKE.META.IGNORE_PATHS += \
> + ${MAKEFILE} \
> + ${SHELL} \
> + ${SYS_MK_DIR}
> +
> # if we think we are updating dependencies,
> # then filemon had better be present
> .if ${UPDATE_DEPENDFILE:Uyes:tl} != "no" && !exists(/dev/filemon)
>
--
Regards,
Bryan Drewery
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 496 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20160909/d839cd8b/attachment.sig>
More information about the svn-src-head
mailing list