From owner-svn-src-head@freebsd.org Mon Aug 20 20:12:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 305BD107B9F7 for ; Mon, 20 Aug 2018 20:12:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22c.google.com (mail-it0-x22c.google.com [IPv6:2607:f8b0:4001:c0b::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B39027FE78 for ; Mon, 20 Aug 2018 20:12:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22c.google.com with SMTP id 72-v6so1130274itw.3 for ; Mon, 20 Aug 2018 13:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=pipuywTftiphXnHXXE47dsiRXPr0OQlKm7PLKVDVD3I=; b=XqIQ1m5HojcatFx6iIJ7SL/vEjaxGTRL+aZp/49XSDrT+GYcGCHWx/DvggS7uDhPGs Q4NgyiwSMVRD8jYmGWuMK7agyj4pyOU3vpueiwO2gWzJmNB7vvBNC+6vG2XfV4WbzCgw VsekT03fEeOGC6nRsdynhgEo3vMzXQ9CBL0dlRULLbPbdNhCZMDrkR5xpWkyHlLT72jT F+y2s8zQvryQav2CFryrQxRvXkbOxgxtZwMhdM0U2uRSMcNuz5YqzXyBwh30jw2RuE6o zUPQx/yCImKG9Oi2T94jrcm4lFC/xLZ17ShrFmX0L6nTU90H3/pRG9pSp9dIi7qcTWSI SCZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=pipuywTftiphXnHXXE47dsiRXPr0OQlKm7PLKVDVD3I=; b=KX0SLcwy+ZCn7vPB5muzxxaIeEF37zkJXpFwDstTySWQTQtT9PN5IcrFSLaSmfZMkz W8QPjsxMGGZtMIxHlV2pjE78jj0sI0DvCnCKhO63+IUzRNER/xIjLB0FtxW50mkvy5Jh sPEkLnmuzKUvm4LPO+L26T2z/JV6QQhGYUZZiScRp2xEWF6c9TTZTEH1VDi+7F/N3+4d CDl85Hb/6fehvBHCZOkQTkoUbngrJSwFzR6MDp9wZptAr0TtF5CeqW7v/B9rmykaZRsM 7CrXPmM4u+pZmUZR7ySUPd7Jl+c0/sTWlTapckp59sP6L6Wg0LMyyyMavHmrmRKXlSHh QJDA== X-Gm-Message-State: AOUpUlF1Drm5vSJEObNC+GloOJ54PS1J79p5EF4mUkAV7UCons/4kzCz cZ0zrB4D/x/ErFs1aTYcWCMFGZapvUMi6xfKVOqIe5EP1Q4= X-Google-Smtp-Source: AA+uWPwskMSly0vTMI68oQHnYjA9btw+rCDDndz9BS0DI2dGbz9pIT16yA7rRog0XpcEH/n7ZL29wlDdvPVRp29/Txk= X-Received: by 2002:a24:9197:: with SMTP id i145-v6mr13484674ite.39.1534795929859; Mon, 20 Aug 2018 13:12:09 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:2806:0:0:0:0:0 with HTTP; Mon, 20 Aug 2018 13:12:09 -0700 (PDT) X-Originating-IP: [50.227.106.226] In-Reply-To: <20180820220025.6a3d141f@thor.intern.walstatt.dynvpn.de> References: <201808201039.w7KAdhfX079450@repo.freebsd.org> <20180820214557.1f8ef5bd@thor.intern.walstatt.dynvpn.de> <20180820220025.6a3d141f@thor.intern.walstatt.dynvpn.de> From: Warner Losh Date: Mon, 20 Aug 2018 14:12:09 -0600 X-Google-Sender-Auth: auufSqG-KYyVB-31adl9jY7PxEY Message-ID: Subject: Re: svn commit: r338096 - head/tools/build/mk To: "O. Hartmann" Cc: "O. Hartmann" , Alex Richardson , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 20:12:11 -0000 On Mon, Aug 20, 2018 at 1:59 PM, O. Hartmann wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > Am Mon, 20 Aug 2018 13:48:45 -0600 > Warner Losh schrieb: > > > On Mon, Aug 20, 2018 at 1:45 PM, O. Hartmann > wrote: > > > > > -----BEGIN PGP SIGNED MESSAGE----- > > > Hash: SHA512 > > > > > > Am Mon, 20 Aug 2018 10:39:43 +0000 (UTC) > > > Alex Richardson schrieb: > > > > > > > Author: arichardson > > > > Date: Mon Aug 20 10:39:42 2018 > > > > New Revision: 338096 > > > > URL: https://svnweb.freebsd.org/changeset/base/338096 > > > > > > > > Log: > > > > Avoid depending on system headers from the source tree during > bootstrap > > > > > > > > This can cause surprising errors if the build tools is built > against > > > > headers that don't match the host system. It is also required in > order > > > > to allow building on non-FreeBSD systems where the headers in > > > > /usr/include/sys are usually completely incompatible with those in > the > > > > source tree. > > > > > > > > I added an error to Makefile.boot if this is done and found this > was > > > > only the case in libnv. With this error in the Makefile ABI > breakages > > > > such as r336019 should no longer be possible. > > > > > > > > Reviewed By: bdrewery, kevans > > > > Approved By: jhb (mentor) > > > > Differential Revision: https://reviews.freebsd.org/D16186 > > > > > > > > Modified: > > > > head/tools/build/mk/Makefile.boot > > > > > > > > Modified: head/tools/build/mk/Makefile.boot > > > > ============================================================ > > > ================== > > > > --- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018 > > > (r338095) > > > > +++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018 > > > (r338096) > > > > @@ -7,3 +7,20 @@ LDFLAGS+= -L${WORLDTMP}/legacy/usr/lib > > > > > > > > # we do not want to capture dependencies referring to the above > > > > UPDATE_DEPENDFILE= no > > > > + > > > > +# When building host tools we should never pull in headers from > the > > > source sys > > > > +# directory to avoid any ABI issues that might cause the built > binary > > > to crash. > > > > +# The only exceptions to this are sys/cddl/compat for dtrace > bootstrap > > > tools and > > > > +# sys/crypto for libmd bootstrap. > > > > +.if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*: > > > N*${SRCTOP}/sys/crypto*) > > > > +.error Do not include $${SRCTOP}/sys when building bootstrap tools. > \ > > > > + Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile > > > instead. \ > > > > + Error was caused by Makefile in ${.CURDIR} > > > > +.endif > > > > + > > > > +# ${SRCTOP}/include should also never be used to avoid ABI issues > > > > +.if !empty(CFLAGS:M*${SRCTOP}/include*) > > > > +.error Do not include $${SRCTOP}/include when building bootstrap > tools. > > > \ > > > > + Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile > > > instead. \ > > > > + Error was caused by Makefile in ${.CURDIR} > > > > +.endif > > > > _______________________________________________ > > > > svn-src-head@freebsd.org mailing list > > > > https://lists.freebsd.org/mailman/listinfo/svn-src-head > > > > To unsubscribe, send any mail to "svn-src-head-unsubscribe@ > freebsd.org" > > > > > > > > > This commit seems to break NanoBSD builds! > > > > > > While r338095 still build my NanoBSD obj tree, >= r338096 fails with: > > > > > > [...] > > > - --- obj_crunchdir_gbde --- > > > cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde && > MK_TESTS=no > > > UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 > > > MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/ > > > pool/sources/CURRENT/src/amd64.amd64/rescue/rescue > > > make MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/gbde/ -DRESCUE > > > CRUNCH_CFLAGS=-DRESCUE > > > MK_AUTO_OBJ=no obj make[5]: "/pool/sources/CURRENT/src/ > > > tools/build/mk/Makefile.boot" > > > line 18: Do not include ${SRCTOP}/sys when building bootstrap tools. > Copy > > > the header to > > > ${WORLDTMP}/legacy in tools/build/Makefile instead. Error was caused > by > > > Makefile > > > in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error > > > code 1 > > > > > > > > > NanoBSD just does a buildworld with a few env vars, but nothing > exotic.... > > > > And in the case of 'obj' target, who cares about the includes... > > > > Warner > > So, how to explain r338095 works, r338096 doesn't? > I'm unsure. I've not had a chance to look closely... Warner