From owner-freebsd-current@FreeBSD.ORG Tue May 6 13:18:31 2014 Return-Path: Delivered-To: current@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 5CB6E982 for ; Tue, 6 May 2014 13:18:31 +0000 (UTC) Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) (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 2A22DC1C for ; Tue, 6 May 2014 13:18:30 +0000 (UTC) Received: by mail-pa0-f41.google.com with SMTP id lj1so8616840pab.0 for ; Tue, 06 May 2014 06:18:30 -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=bca8/SpV/07Hfxoz8fYwavGepkLPIwt/PkiYJVl/kAw=; b=N+tCXHMBuQR1y6xTkSHwHyW6sfWbqatl3iGhkOHm68RZMwkRrJgIxIwPJX2DAvbnRD 0Iz4iaaCAabT0PKIajYwl+B0XzSGEOQyPyvAVt8eIhH+aHHNY0zdq2ZVdrbpJE8KVsTl 1HU1txaSXPShCuJq4fAW6qkorKIFH2gIzwzw0v5h98olTBmYylrt/+r+wDZndnsZ/84/ j5GHqL6u3MQ14Zqvmd/y13UR9Yr3ksW/RMywAkXTBD8Phod9jn8dMjQV2NY3x9H0Lmhk Bbx+bvPbF6EcI/VqvZdgfnGzgZrDqI/LzRCvTzvf/wTlH0EguA2CmA7WPa+pWMDcIA7z fBSA== X-Gm-Message-State: ALoCoQntvONI5Tz/Z0CI9NkI5TRWJ/R8QgVULWqtyBLZj2GN86BOKGh0Yi7Zj+/TsPI8rjz/tQL0 X-Received: by 10.66.250.161 with SMTP id zd1mr6372416pac.136.1399382310055; Tue, 06 May 2014 06:18:30 -0700 (PDT) Received: from [10.64.26.239] (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id sv10sm336901pbc.74.2014.05.06.06.18.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 May 2014 06:18:29 -0700 (PDT) Sender: Warner Losh Content-Type: multipart/signed; boundary="Apple-Mail=_3FC24D02-E052-499D-9AB1-B41EC184C759"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: buildworld fails (missing /usr/share/mk/src.opts.mk) From: Warner Losh In-Reply-To: Date: Tue, 6 May 2014 07:18:26 -0600 Message-Id: References: <5368B0C5.6040309@freebsd.org> <5368C675.1070700@freebsd.org> <5368D7F1.4040009@freebsd.org> To: Stefan Esser X-Mailer: Apple Mail (2.1874) Cc: "current@freebsd.org" , Trond.Endrestol@fagskolen.gjovik.no X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 13:18:31 -0000 --Apple-Mail=_3FC24D02-E052-499D-9AB1-B41EC184C759 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On May 6, 2014, at 7:16 AM, Warner Losh wrote: >=20 > On May 6, 2014, at 6:39 AM, Stefan Esser wrote: >=20 >> Am 06.05.2014 13:44, schrieb Trond Endrest=F8l: >>> On Tue, 6 May 2014 13:24+0200, Stefan Esser wrote: >>>> Am 06.05.2014 11:52, schrieb Stefan Esser: >>>>> Hi Warner, >>>>>=20 >>>>> as already reported by Jenkins, HEAD does not build. >>>>>=20 >>>>> Seems that this is caused by src.opts.mk missing in /usr/share/mk >>>>> during the cleandir phase. I guess this is kind of a bootstrap >>>>> issue - the definitions are looked up in the installed base, not >>>>> in the src tree - but did not verify this assumption. >>>>>=20 >>>>> A work-around is to manually install src.opts.mk: >>>>>=20 >>>>> # make -C /usr/src/share/mk install >>>>>=20 >>>>> (which might deserve an UPDATING entry). Falling back on the file >>>>> in the src directory might be a better solution ... >>>>>=20 >>>>> Regards, STefan >>>>=20 >>>> Following up to my earlier mail: >>>>=20 >>>> The diagnosis was wrong - the main Makefiles include src.opts.mk = from >>>> the source directory. But two sub-ordinate Makefiles missed to = include >>>> the new options file (sys/conf/kmod.mk and = sys/modules/drm2/Makefile). >>>>=20 >>>> I committed a fix/work-around to stop the flood of tinderbox = messages >>>> (r265433). >>>=20 >>> tinderbox still complains about usr.bin/bmake/Makefile.inc. >>=20 >> Hmmm, I managed to buildworld -HEAD after this patch, but it is >> possible, that I had src.opts.mk installed in /usr/share/mk when >> I started the build. >>=20 >> (I later deleted it, to be sure that the version in the source >> directory was found and used when building modules, which the >> commit actually fixed.) >>=20 >> I guess the remaining problem is caused by >>=20 >> .include "src.opts.mk" >>=20 >> in line 3 of src/usr.bin/bmake/Makefile.inc >>=20 >> Changing this line to read ".include " seems to fix >> it on my system. >>=20 >> --- usr.bin/bmake/Makefile.inc~ >> +++ usr.bin/bmake/Makefile.inc >> @@ -1,6 +1,6 @@ >> # $FreeBSD$ >>=20 >> -.include "src.opts.mk" >> +.include >>=20 >> .if defined(.PARSEDIR) >> # make sure this is available to unit-tests/Makefile >>=20 >> It is possible, that the build will still fail at a latter stage, >> though (buildworld is still running). >>=20 >> I committed the above patch, since it gets buildworld through the >> bmake subdirectory at least (r265436). If buildworld fails again, >> then I'll commit any further missing fixes in one go. I'll know >> in some 20 minutes. >=20 > What is your source system? This is absolutely the wrong change, and = shouldn=92t be necessary at all. These changes survived a universe run = and a few build worlds on other systems. so I=92d like to know how to recreate it, since I didn=92t see this in = any of my testing over the last two weeks... > Warner --Apple-Mail=_3FC24D02-E052-499D-9AB1-B41EC184C759 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 iQIcBAEBCgAGBQJTaOEiAAoJEGwc0Sh9sBEA/XUP/04G8Nbes2ABRaszgVtm/MfY 3NK+yCejbEZmo6SENJnrYmbS2KOotmKxq1ZJBDESH0mmynNaIplLUXhroVoqJ10I WiedvKQezWU2CezpwUB77zTKw0oHaKTWr2zmcZXXeOystLS6HRyWxmB4Jxvgas1j pg3NQha5lPZ6iksyDBR4wSZZgjwjBrHJV3wO1vmxUYFPo3EtH2bMHx2gKaMqkj7w 4sD9MY8vXEeKGbW2CkHKl97QPkdODeFLIAJDMiRlKGg5EBfcdgmxCLpUx6INVY+k 9UQDIfZwnH5POnF8q3U294Zm0hMReBUeMWVSc5XQWerAgyZ/GcwooD1zd3hZ/I98 20HHM7N4FWGIIc7b8DByG2tMOxcPeH4s+woQDwrWUV+rzV9fKuwMGvS19RlFDSdK SMLnbs+hJFhNu7k2iTL/emTzLPges+cyx+VV/nCvWZCzvTn81Ct6WflX+mwHl6QP GZUU9w5q7BoY+R1oywycZQrfYyRpaS11Eu8xGr6BPk4HopoYBJw/Lcr7HKSbZUti 4FXqI+hN9F8bAbb16ox7SDhKEWBuGxY1GIP+DsxqfNSKIihuJ5hkJtXrvFJxcNuc uWySyNP8KIQ8Xc16RYZkNn8AWHNtrEfXncJDXqb/JkfSosz1AzuSfXKiwh89oP69 FxKJvhKVZKMwZbVm/7Hi =L9+t -----END PGP SIGNATURE----- --Apple-Mail=_3FC24D02-E052-499D-9AB1-B41EC184C759--