From owner-svn-src-all@FreeBSD.ORG Thu May 15 13:34:40 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 727ABD9A for ; Thu, 15 May 2014 13:34:40 +0000 (UTC) Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com [209.85.223.177]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3779C28C7 for ; Thu, 15 May 2014 13:34:39 +0000 (UTC) Received: by mail-ie0-f177.google.com with SMTP id rp18so998534iec.36 for ; Thu, 15 May 2014 06:34:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:message-id:references:to; bh=i2Zkh3nwR38KNP56rZ5de3GMxfA2lb3+oI+cf660sy8=; b=hbu0SlS57AaPEFmWK3uN+wjzpzT9bBed0AXa7tf/6IZ6wDVhIvrCVpTlggh9Wz1BSW Z1hQ2ELaOkMKTyhNBhTMGY4EbsZPNe0EpVcizzi1Q2CQ6LNacpVmrXSQp3CJqA4XbUF9 87prijgebZ+DRHJpICpWO0ZtqMu7s2qQ4/a2wbxn0xQ0nEnqzg0Y8Rg/0zNj2U+pjeiO 10gfm72RxOtFJhtL5Rw/ju0LZUmvHuUm35S1/zL1Vvc3yfIur58JfsQbX9qHal2HQowh HInJn86jRgqJCMTQmDxU8pwBF/wHmHCODUdzZtXHNEJ4xkZL12gI7lf2Wkp5p7gWEgye eUWw== X-Gm-Message-State: ALoCoQmA8fF3hVrfZ9LJDJF1OMzNXYeXXi1SODt5pSq7BeSlp7xYpcmfx9cWjq7UbDYRs3Fowz9q X-Received: by 10.50.57.17 with SMTP id e17mr72828630igq.10.1400160879155; Thu, 15 May 2014 06:34:39 -0700 (PDT) Received: from [10.69.224.86] ([137.122.64.13]) by mx.google.com with ESMTPSA id qo12sm21002907igb.21.2014.05.15.06.34.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 06:34:38 -0700 (PDT) Sender: Warner Losh Content-Type: multipart/signed; boundary="Apple-Mail=_5B1FB5B7-03B5-4810-B14C-2EBB27340DFD"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r266104 - head/usr.bin/bmake From: Warner Losh In-Reply-To: <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org> Date: Thu, 15 May 2014 09:34:36 -0400 Message-Id: References: <201405150127.s4F1RPxK072767@svn.freebsd.org> <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org> To: Julio Merino X-Mailer: Apple Mail (2.1874) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Warner Losh X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Thu, 15 May 2014 13:34:40 -0000 --Apple-Mail=_5B1FB5B7-03B5-4810-B14C-2EBB27340DFD Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On May 15, 2014, at 9:31 AM, Julio Merino wrote: > On May 14, 2014, at 21:27, Warner Losh wrote: >=20 >> Author: imp >> Date: Thu May 15 01:27:24 2014 >> New Revision: 266104 >> URL: http://svnweb.freebsd.org/changeset/base/266104 >>=20 >> Log: >> Undo changes to the generated Makefile. Move tests directory to = proper >> location, including updating the test to work in the more-fragile >> fmake -> bmake bootstrap environment. >>=20 >> Modified: >> head/usr.bin/bmake/Makefile >> head/usr.bin/bmake/Makefile.inc > [...] >> Modified: head/usr.bin/bmake/Makefile.inc >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/usr.bin/bmake/Makefile.inc Thu May 15 01:06:27 2014 = (r266103) >> +++ head/usr.bin/bmake/Makefile.inc Thu May 15 01:27:24 2014 = (r266104) >> @@ -13,5 +13,9 @@ PROG=3D make >> NO_SHARED?=3D YES >> .endif >>=20 >> +.if defined(MK_TESTS) && ${MK_TESTS} !=3D no >> +SUBDIR+=3D tests >> +.endif >> + >=20 > Ugh, and this broke the build when MK_TESTS=3Dyes. The problem is = that tests/Makefile transparently includes ../Makefile.inc, which = defines SUBDIR+=3Dtests (as above)... and this is obviously invalid = within the tests subdirectory. >=20 > What's your suggestion to fix this? I can think of renaming = Makefile.inc to something different to ensure that the subdirectories = don't spuriously include it.=09 That may be the best solution, but I=92d like a little time to think = about it=85 The other option is to toss an && exists(${.CURDIR}/tests) = on the end as well... Warner --Apple-Mail=_5B1FB5B7-03B5-4810-B14C-2EBB27340DFD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJTdMJsAAoJEGwc0Sh9sBEAALsP/0xd2s8l3N8ZutHrHCuP5Txj pkv5XEkE2kQC7//zWkYibQid00h69SIWVA6Kc/9kp0Zh8KyqkC2Bs9XWhxKgMUtB bx3dlf1A8Q0eqVvn+bnHcaNcjoPbrk8wXr/XeA8+zBLCV2C3MFblPSbEC/nl6T5F r+iFGoq1fVvnBmekdIBAT+cBDesuXkA/1/JAm03m0D4s+6zYmAOC+UlsUF0dnhNJ LMdXBCWIvuJ/96xowE2EczRVtavoPsMnmLSfpFst3QUUnt3lcTHQ+NbLcFNZ+WvX p3/JLraBnqXbZdwvtlSArThHknxFFKV79Nxy2ss58xMXLUIAUiaMFmDxflB7kynU s4Tbp6BUi2BCC+fbHd4i4MMjAxhvTI7LaHK7NhDBgwTyhQvJOFShqFgpoPUQL0e5 Pz5NAvsOGgcZ6FrurydI76XiuzFZbBiN10t/67JJ1d3+txB9LU/xAmKbHTFPMBsj wRnaSIT1MskYvQEkadujlEcXynRqrBsRh41HARv4uMjz976k7BKbCmz1W7CeDn5O zy49AD59Alj+BELnsSY96rH1oaHaKcfBtEE8DV0+vSm2oX/4YuLPhk0EiSA1YhJy 1YfgrtQyrxEz8V3ZscTZb4rEtlDDIsmfrFnFoU0JZdL4P0F/Zz3UOKZJTVO32/Wu BF/rTZfPGzOjlsQ1frZe =lQmV -----END PGP SIGNATURE----- --Apple-Mail=_5B1FB5B7-03B5-4810-B14C-2EBB27340DFD--