Date: Tue, 03 Sep 2019 14:05:51 -0000 From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345652 - projects/capsicum-test/share/mk Message-ID: <201903282013.x2SKDYqs069332@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Mar 28 20:13:34 2019 New Revision: 345652 URL: https://svnweb.freebsd.org/changeset/base/345652 Log: Ensure values specified for BINMODE.*, etc can actually be set by the caller It would, previously, set the value of BINMODE.mini-me.setuid to the default, which is not the intention of PROG_OVERRIDE_VARS. PROG_OVERRIDE_VARS _needs_ to override the value, if set, not just set the value to an empty one. Modified: projects/capsicum-test/share/mk/bsd.progs.mk Modified: projects/capsicum-test/share/mk/bsd.progs.mk ============================================================================== --- projects/capsicum-test/share/mk/bsd.progs.mk Thu Mar 28 20:04:26 2019 (r345651) +++ projects/capsicum-test/share/mk/bsd.progs.mk Thu Mar 28 20:13:34 2019 (r345652) @@ -34,6 +34,11 @@ $v += ${${v}.${PROG}} $v += ${${v}_${PROG}} .endif .else +.if defined(${v}.${PROG}) +$v = ${${v}.${PROG}} +.elif defined(${v}_${PROG}) +$v = ${${v}_${PROG}} +.endif $v ?= .endif .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903282013.x2SKDYqs069332>