diff options
| author | sjg <sjg@FreeBSD.org> | 2013-10-12 23:48:21 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-10-12 23:48:21 +0000 |
| commit | 96ce9379f8496012b132ba4dc277b5ade195bf20 (patch) | |
| tree | b17e5bf2edb84c4de2f8ddf3f9630fdde06dbeca /share/mk/local.gendirdeps.mk | |
| parent | 5892775af6d18a2188b399340803e90e644e4051 (diff) | |
| download | FreeBSD-src-96ce9379f8496012b132ba4dc277b5ade195bf20.zip FreeBSD-src-96ce9379f8496012b132ba4dc277b5ade195bf20.tar.gz | |
Add more vars we subst into DIRDEPS eg. BOOT_MACHINE_DIR and KERNEL_NAME.
Make it easier to add more.
Diffstat (limited to 'share/mk/local.gendirdeps.mk')
| -rw-r--r-- | share/mk/local.gendirdeps.mk | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk index 88c11e9..28b589d 100644 --- a/share/mk/local.gendirdeps.mk +++ b/share/mk/local.gendirdeps.mk @@ -1,10 +1,26 @@ -# supress optional dependecies +# supress optional/auto dependecies # local.dirdeps.mk will put them in if necessary -GENDIRDEPS_FILTER+= Ngnu/lib/libssp/libssp_nonshared +GENDIRDEPS_FILTER+= \ + Ngnu/lib/libssp/libssp_nonshared \ + Ncddl/usr.bin/ctf* \ + Npkgs/pseudo/stage* # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple -GENDIRDEPS_FILTER+= ${CSU_DIR:L:@v@S,/${$v},/_{${v}},@} +# order of this list matters! +GENDIRDEPS_FILTER_DIR_VARS+= \ + CSU_DIR \ + BOOT_MACHINE_DIR -# this could easily get confused -GENDIRDEPS_FILTER+= ${MACHINE_CPUARCH MACHINE_CPU MACHINE_ARCH MACHINE:L:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u} +# order of this list matters! +GENDIRDEPS_FILTER_VARS+= \ + KERNEL_NAME \ + MACHINE_CPUARCH \ + MACHINE_ARCH \ + MACHINE + +GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_DIR_VARS:@v@S,${$v},_{${v}},@} +GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_VARS:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u} + +# handle the non-standard way that gnu/usr.bin/groff/tmac is staged +GENDIRDEPS_FILTER+= C,.*usr/share/tmac.*stage,gnu/usr.bin/groff/tmac, |
