From owner-svn-src-head@freebsd.org Sat Nov 4 22:30:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73EBAE57F69; Sat, 4 Nov 2017 22:30:48 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E29A94A; Sat, 4 Nov 2017 22:30:47 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id B6xge8OEuI8mCB6xheNCEs; Sat, 04 Nov 2017 16:30:46 -0600 X-Authority-Analysis: v=2.2 cv=HahkdmM8 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=iaTFZB6CAAAA:8 a=YxBL1-UpAAAA:8 a=7ESa97CNvrHrRBSPpZkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=QWXrQ9iV8q7LKaLQ9lfw:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id BB99EFEC; Sat, 4 Nov 2017 15:30:43 -0700 (PDT) Received: from slippy (localhost [IPv6:0:0:0:0:0:0:0:1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vA4MUhjw014138; Sat, 4 Nov 2017 15:30:43 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711042230.vA4MUhjw014138@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Bryan Drewery cc: "O. Hartmann" , "Simon J. Gerraty" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk In-Reply-To: Message from Bryan Drewery of "Sat, 04 Nov 2017 15:00:14 -0700." <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 04 Nov 2017 15:30:43 -0700 X-CMAE-Envelope: MS4wfFgU+xhC/yXLNVIDReByoCXfRIg1zGIyTB4fdk771mWYbe1DvDHLxuc4i5M89PSvHDI0dU1iFx2VjOxUsWYnMrDrxMNDasPQgKHbPKRoCJiTGMAp5JfC xRiV5HavXWwJW3SUcXmvOV6fxFruNNtLj09CdqBAjH3FIj3Z0QFq2SDczpxCm1MkmnKQL1sgDUpHVKEkPoWU+Q/NnHt6EfgpTLWbeSj5zvnDXGkbPRmwZ8d1 hyssh6G4/0kr4Zc71fFBOrQmONyJrsBRcix0i7viu7ixnKT88GnMRMEesnjLDZMlChy4jO8Au3iqbcGL9wQrPRtHSMLPnTjFVCfCHrIBgzWLI0wCb7MrCn9S wgE+fekR X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 04 Nov 2017 22:30:48 -0000 In message <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org>, Bryan Drewery wr ites: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD > Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h"; > protected-headers="v1" > From: Bryan Drewery > To: "O. Hartmann" , "Simon J. Gerraty" > > Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, > src-committers@freebsd.org > Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org> > Subject: Re: svn commit: r325404 - head/share/mk > References: <201711042102.vA4L2RuR063978@repo.freebsd.org> > <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> > <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> > In-Reply-To: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> > > --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > On 11/4/2017 2:36 PM, O. Hartmann wrote: > > Am Sat, 4 Nov 2017 22:31:33 +0100 > > "O. Hartmann" schrieb: > >=20 > >> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) > >> "Simon J. Gerraty" schrieb: > >> > >>> Author: sjg > >>> Date: Sat Nov 4 21:02:26 2017 > >>> New Revision: 325404 > >>> URL: https://svnweb.freebsd.org/changeset/base/325404 > >>> > >>> Log: > >>> Ensure .OBJDIR has known value > >>> =20 > >>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired > >>> use .CURDIR so that at least the classic > >>> .if ${.OBJDIR} !=3D ${.CURDIR} > >>> works and dangerous misstakes can be avoided. > >>> =20 > >>> Reviewed by: bdrewery > >>> > >>> Modified: > >>> head/share/mk/auto.obj.mk > >>> > >>> Modified: head/share/mk/auto.obj.mk > >>> =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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r32540 > 3) > >>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r32540 > 4) > >>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ= > DIR_UMA > >>> .endif > >>> # This causes make to use the specified directory as .OBJDIR > >>> .OBJDIR: ${__objdir} > >>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob= > jdir}/*} !=3D "" > >>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} > >>> +# we did not get what we want - do we care? > >>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" > >>> # watch out for __objdir being relative path > >>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}= > /${__objdir}:L:tA}) > >>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} > >>> .endif > >>> +.endif > >>> +# apparently we can live with it > >>> +# make sure we know what we have > >>> +.OBJDIR: ${.CURDIR} > >>> .endif > >>> .endif > >>> .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.or= > g" =20 > >> > >> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild= > with the error > >> shown below: > >> > >> [...] > >> =3D=3D=3D> src/nvidia (all) =20 > >> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional= > > >> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})= > make[7]: Fatal errors > >> encountered -- cannot continue > >> [...] > >=20 > > The very same with emulators/virtualbox-ose-kmod: > >=20 > > [...] > > kBuild: > > Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi= > rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src= > /vboxdrv/Makefile > > =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/= > mk/bsd.obj.mk" line 87: > > Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI= > R} =3D=3D /${RELDIR}) > > make[6]: Fatal errors encountered -- cannot continue make[6]: stopped > > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= > -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv= > > > *** Error code 1 > >=20 > > Stop. > > make[5]: stopped > > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox= > -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src > > =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE= > =3Dyes and rebuild before > > reporting the failure to the maintainer. > > *** Error code 1 > >=20 > >=20 > > It was r325405 ... fixed in r325408. Not really, mergemaster output. *** Creating the temporary root environment in /tmp/temproot *** /tmp/temproot ready for use *** Creating and populating directory structure in /tmp/temproot make[3]: "/opt/src/svn-current/share/mk/bsd.obj.mk" line 89: .OBJDIR incorrectly set to /etc/autofs *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install files to the temproot environment -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.