b897d72a5a
Changes since 20181221 are mostly portability related
hence the large gap in versions imported.
There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.
FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.
Summary of changes from ChangeLog
o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert
plus more unit-tests
112 lines
3.4 KiB
Makefile
112 lines
3.4 KiB
Makefile
# $Id: bsd.after-import.mk,v 1.15 2018/12/30 17:14:24 sjg Exp $
|
|
|
|
# This makefile is for use when integrating bmake into a BSD build
|
|
# system. Use this makefile after importing bmake.
|
|
# It will bootstrap the new version,
|
|
# capture the generated files we need, and add an after-import
|
|
# target to allow the process to be easily repeated.
|
|
|
|
# The goal is to allow the benefits of autoconf without
|
|
# the overhead of running configure.
|
|
|
|
all: _makefile
|
|
all: after-import
|
|
|
|
# we rely on bmake
|
|
.if !defined(.PARSEDIR)
|
|
.error this makefile requires bmake
|
|
.endif
|
|
|
|
_this := ${MAKEFILE:tA}
|
|
BMAKE_SRC := ${.PARSEDIR}
|
|
|
|
# it helps to know where the top of the tree is.
|
|
.if !defined(SRCTOP)
|
|
srctop := ${.MAKE.MAKEFILES:M*src/share/mk/sys.mk:H:H:H}
|
|
.if empty(srctop)
|
|
# likely locations?
|
|
.for d in contrib/bmake external/bsd/bmake/dist
|
|
.if ${BMAKE_SRC:M*/$d} != ""
|
|
srctop := ${BMAKE_SRC:tA:S,/$d,,}
|
|
.endif
|
|
.endfor
|
|
.endif
|
|
.if !empty(srctop)
|
|
SRCTOP := ${srctop}
|
|
.endif
|
|
.endif
|
|
|
|
# This lets us match what boot-strap does
|
|
.if !defined(HOST_OS)
|
|
HOST_OS!= uname
|
|
.endif
|
|
|
|
BOOTSTRAP_ARGS = \
|
|
--prefix /usr \
|
|
--share /usr/share
|
|
|
|
.if !empty(DEFAULT_SYS_PATH)
|
|
BOOTSTRAP_ARGS += --with-default-sys-path='${DEFAULT_SYS_PATH}'
|
|
.endif
|
|
|
|
# run boot-strap with minimal influence
|
|
bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE}
|
|
HOME=/ ${BMAKE_SRC}/boot-strap -o ${HOST_OS} ${BOOTSTRAP_ARGS} ${BOOTSTRAP_XTRAS}
|
|
touch ${.TARGET}
|
|
|
|
# Makefiles need a little more tweaking than say config.h
|
|
MAKEFILE_SED = sed -e '/^MACHINE/d' \
|
|
-e '/include.*VERSION/d' \
|
|
-e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \
|
|
-e 's,^.-include,.sinclude,' \
|
|
-e '/^\..*include *</ { s,<,<bsd.,;/autoconf/d; }' \
|
|
-e 's,${SRCTOP},$${SRCTOP},g'
|
|
|
|
# These are the simple files we want to capture
|
|
configured_files= config.h Makefile.config unit-tests/Makefile.config
|
|
|
|
after-import: bootstrap ${MAKEFILE}
|
|
.for f in ${configured_files:M*.[ch]}
|
|
@echo Capturing $f
|
|
@mkdir -p ${${.CURDIR}/$f:L:H}
|
|
@(echo '/* $$${HOST_OS}$$ */'; cat ${HOST_OS}/$f) > ${.CURDIR}/$f
|
|
.endfor
|
|
.for f in ${configured_files:M*Makefile*}
|
|
@echo Capturing $f
|
|
@mkdir -p ${${.CURDIR}/$f:L:H}
|
|
@(echo '# This is a generated file, do NOT edit!'; \
|
|
echo '# See ${_this:S,${SRCTOP}/,,}'; \
|
|
echo '#'; echo '# $$${HOST_OS}$$'; echo; \
|
|
echo 'SRCTOP?= $${.CURDIR:${${.CURDIR}/$f:L:H:S,${SRCTOP}/,,:C,[^/]+,H,g:S,/,:,g}}'; echo; \
|
|
${MAKEFILE_SED} ${HOST_OS}/$f ) > ${.CURDIR}/$f
|
|
.endfor
|
|
|
|
# this needs the most work
|
|
_makefile: bootstrap ${MAKEFILE}
|
|
@echo Generating ${.CURDIR}/Makefile
|
|
@(echo '# This is a generated file, do NOT edit!'; \
|
|
echo '# See ${_this:S,${SRCTOP}/,,}'; \
|
|
echo '#'; echo '# $$${HOST_OS}$$'; \
|
|
echo; echo 'SRCTOP?= $${.CURDIR:${.CURDIR:S,${SRCTOP}/,,:C,[^/]+,H,g:S,/,:,g}}'; \
|
|
echo; echo '# look here first for config.h'; \
|
|
echo 'CFLAGS+= -I$${.CURDIR}'; echo; \
|
|
echo '# for after-import'; \
|
|
echo 'CLEANDIRS+= ${HOST_OS}'; \
|
|
echo 'CLEANFILES+= bootstrap'; echo; \
|
|
${MAKEFILE_SED} \
|
|
${1 2:L:@n@-e '/start-delete$n/,/end-delete$n/d'@} \
|
|
${BMAKE_SRC}/Makefile; \
|
|
echo; echo '# override some simple things'; \
|
|
echo 'BINDIR= /usr/bin'; \
|
|
echo 'MANDIR= ${MANDIR:U/usr/share/man}'; \
|
|
echo; echo '# make sure we get this'; \
|
|
echo 'CFLAGS+= $${COPTS.$${.IMPSRC:T}}'; \
|
|
echo; echo 'after-import: ${_this:S,${SRCTOP},\${SRCTOP},}'; \
|
|
echo ' cd $${.CURDIR} && $${.MAKE} -f ${_this:S,${SRCTOP},\${SRCTOP},}'; \
|
|
echo ) > ${.TARGET}
|
|
@cmp -s ${.TARGET} ${.CURDIR}/Makefile || \
|
|
mv ${.TARGET} ${.CURDIR}/Makefile
|
|
|
|
.include <bsd.obj.mk>
|
|
|