Date: Sat, 12 Oct 2013 23:48:22 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256409 - projects/bmake/share/mk Message-ID: <201310122348.r9CNmM5S045358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Sat Oct 12 23:48:21 2013 New Revision: 256409 URL: http://svnweb.freebsd.org/changeset/base/256409 Log: Add more vars we subst into DIRDEPS eg. BOOT_MACHINE_DIR and KERNEL_NAME. Make it easier to add more. Modified: projects/bmake/share/mk/local.gendirdeps.mk Modified: projects/bmake/share/mk/local.gendirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.gendirdeps.mk Sat Oct 12 23:46:41 2013 (r256408) +++ projects/bmake/share/mk/local.gendirdeps.mk Sat Oct 12 23:48:21 2013 (r256409) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310122348.r9CNmM5S045358>