From owner-svn-src-all@freebsd.org Wed Mar 18 03:31:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9A06A27B042; Wed, 18 Mar 2020 03:31:55 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (mx.allbsd.org [IPv6:2001:2f0:104:e001::41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.allbsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48hwZL4QKnz4LVj; Wed, 18 Mar 2020 03:31:54 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org ([IPv6:2409:11:a740:4700:58:65ff:fe00:b0b]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id 02I3VPvj092919 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK) (Client CN "/CN=mail-d.allbsd.org", Issuer "/C=US/O=Let's+20Encrypt/CN=Let's+20Encrypt+20Authority+20X3"); Wed, 18 Mar 2020 12:31:37 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.d.allbsd.org ([IPv6:2409:11:a740:4700:16:ceff:fe34:2700]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id 02I3VKTT028531 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 18 Mar 2020 12:31:20 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [[UNIX: localhost]]) (authenticated bits=0) by alph.d.allbsd.org (8.15.2/8.15.2) with ESMTPA id 02I3VK9k028527; Wed, 18 Mar 2020 12:31:20 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Wed, 18 Mar 2020 12:29:24 +0900 (JST) Message-Id: <20200318.122924.1446699160859237014.hrs@FreeBSD.org> To: brooks@FreeBSD.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r359046 - head/share/mk From: Hiroki Sato In-Reply-To: <202003171817.02HIHWdY035423@repo.freebsd.org> References: <202003171817.02HIHWdY035423@repo.freebsd.org> X-Old-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-PGPkey-fingerprint: 6C0D 2353 27CF 80C7 901E FDD2 DBB0 7DC6 6F1F 737F X-Mailer: Mew version 6.8 on Emacs 26.3 Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha512; boundary="--Security_Multipart(Wed_Mar_18_12_29_24_2020_910)--" Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.allbsd.org [IPv6:2001:2f0:104:e001:0:0:0:41]); Wed, 18 Mar 2020 12:31:43 +0900 (JST) X-Rspamd-Queue-Id: 48hwZL4QKnz4LVj X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.98)[0.976,0]; NEURAL_SPAM_MEDIUM(0.96)[0.964,0]; ASN(0.00)[asn:7514, ipnet:2001:2f0::/32, country:JP] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2020 03:31:55 -0000 ----Security_Multipart(Wed_Mar_18_12_29_24_2020_910)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Brooks Davis wrote in <202003171817.02HIHWdY035423@repo.freebsd.org>: br> Author: brooks br> Date: Tue Mar 17 18:17:32 2020 br> New Revision: 359046 br> URL: https://svnweb.freebsd.org/changeset/base/359046 br> br> Log: br> Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions. br> br> This allows simplification of Makefiles where some SUBDIR entries depend br> on two things (e.g. something that depends on C++ and some other knob). Just my two cents, but SUBDIR.${MK_FOO:M${MK_BAR}:M${MK_BAZ}}= dir should do the trick. I am not sure how many variables we need to support in practice, adding ".yes.yes..." in bsd.subdir.mk looks less flexible to me. br> Discussed with: imp, jhb br> Obtained from: CheriBSD br> MFC after: 3 days br> Sponsored by: DARPA br> br> Modified: br> head/share/mk/bsd.subdir.mk br> br> Modified: head/share/mk/bsd.subdir.mk br> ============================================================================== br> --- head/share/mk/bsd.subdir.mk Tue Mar 17 17:28:12 2020 (r359045) br> +++ head/share/mk/bsd.subdir.mk Tue Mar 17 18:17:32 2020 (r359046) br> @@ -16,8 +16,8 @@ br> # br> # SUBDIR A list of subdirectories that should be built as well. br> # Each of the targets will execute the same target in the br> -# subdirectories. SUBDIR.yes is automatically appended br> -# to this list. br> +# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are br> +# automatically appended to this list. br> # br> # +++ targets +++ br> # br> @@ -122,8 +122,8 @@ install: beforeinstall realinstall afterinstall br> # SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD br> .if !target(_SUBDIR) br> br> -.if defined(SUBDIR) || defined(SUBDIR.yes) br> -SUBDIR:=${SUBDIR} ${SUBDIR.yes} br> +.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes) br> +SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes} br> SUBDIR:=${SUBDIR:u} br> .endif br> br> ----Security_Multipart(Wed_Mar_18_12_29_24_2020_910)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iMgEABMKAC4WIQRsDSNTJ8+Ax5Ae/dLbsH3Gbx9zfwUCXnGVlBAcaHJzQGZyZWVi c2Qub3JnAAoJENuwfcZvH3N/ErgCCJVGV251RB+YFoVbyGnICsWOiB+h5NfcrdZy G3Q+mbCfqKtew0OCwdwtaYJ1QBNwev7ApEUwEtTYJNKLh0aFGphKAgYvkhvus6YD v812NjNJrkK6cixsh8odnUh0oh/S937UKSjWwG2hwn9HxPIE15YA5b8Y3m6rVouh JA1MXQ9v8hbX7g== =jsiK -----END PGP SIGNATURE----- ----Security_Multipart(Wed_Mar_18_12_29_24_2020_910)----