From owner-freebsd-current@FreeBSD.ORG Tue May 6 12:46:16 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 AA18332E; Tue, 6 May 2014 12:46:16 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mailout00.t-online.de", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A74F7CB; Tue, 6 May 2014 12:46:16 +0000 (UTC) Received: from fwd20.aul.t-online.de (fwd20.aul.t-online.de [172.20.26.140]) by mailout04.t-online.de (Postfix) with SMTP id 52D1CDA7E1; Tue, 6 May 2014 14:38:52 +0200 (CEST) Received: from [192.168.119.11] (rSlO8EZfYh481fZ2qWvY77fRhuZmYRq1ZjhjN-Tns0i4SgcusIZeo-GpqUHHWYAZIt@[84.154.114.101]) by fwd20.t-online.de with esmtp id 1WheeU-1XQWI40; Tue, 6 May 2014 14:39:18 +0200 Message-ID: <5368D7F1.4040009@freebsd.org> Date: Tue, 06 May 2014 14:39:13 +0200 From: Stefan Esser User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "current@freebsd.org" , Trond.Endrestol@fagskolen.gjovik.no Subject: Re: buildworld fails (missing /usr/share/mk/src.opts.mk) References: <5368B0C5.6040309@freebsd.org> <5368C675.1070700@freebsd.org> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-ID: rSlO8EZfYh481fZ2qWvY77fRhuZmYRq1ZjhjN-Tns0i4SgcusIZeo-GpqUHHWYAZIt X-TOI-MSGID: 0f95f3ba-0435-41ce-9f61-f5d45a6d5fb1 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 12:46:16 -0000 Am 06.05.2014 13:44, schrieb Trond Endrestøl: > On Tue, 6 May 2014 13:24+0200, Stefan Esser wrote: >> Am 06.05.2014 11:52, schrieb Stefan Esser: >>> Hi Warner, >>> >>> as already reported by Jenkins, HEAD does not build. >>> >>> 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. >>> >>> A work-around is to manually install src.opts.mk: >>> >>> # make -C /usr/src/share/mk install >>> >>> (which might deserve an UPDATING entry). Falling back on the file >>> in the src directory might be a better solution ... >>> >>> Regards, STefan >> >> Following up to my earlier mail: >> >> 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). >> >> I committed a fix/work-around to stop the flood of tinderbox messages >> (r265433). > > tinderbox still complains about usr.bin/bmake/Makefile.inc. 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. (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.) I guess the remaining problem is caused by .include "src.opts.mk" in line 3 of src/usr.bin/bmake/Makefile.inc Changing this line to read ".include " seems to fix it on my system. --- usr.bin/bmake/Makefile.inc~ +++ usr.bin/bmake/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "src.opts.mk" +.include .if defined(.PARSEDIR) # make sure this is available to unit-tests/Makefile It is possible, that the build will still fail at a latter stage, though (buildworld is still running). 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. Regards, STefan