From owner-svn-src-all@freebsd.org Sun Nov 5 01:44:00 2017 Return-Path: Delivered-To: svn-src-all@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 4241DE5D6C0; Sun, 5 Nov 2017 01:44:00 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (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 DC86C677C0; Sun, 5 Nov 2017 01:43:59 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id B9yYeMmtGDJTWB9yZessSw; Sat, 04 Nov 2017 19:43:52 -0600 X-Authority-Analysis: v=2.2 cv=B4DJ6KlM 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=BWvPGDcYAAAA:8 a=iaTFZB6CAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=4kCip34jSpZ0RTkP-xsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=pxhY87DP9d2VeQe4joPk:22 a=QWXrQ9iV8q7LKaLQ9lfw:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id DEFDF32D; Sat, 4 Nov 2017 18:43:49 -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 vA51hnvP082564; Sat, 4 Nov 2017 18:43:49 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711050143.vA51hnvP082564@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: Cy Schubert , "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 17:12:36 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 04 Nov 2017 18:43:49 -0700 X-CMAE-Envelope: MS4wfAWpZ5PdyDVfxkuxVR8VjkH9JHYwq3QvDMPZgByw9nqG0J2K7KTnYu3jNFA6Qfydq9upLhIVdQmWuisDwNLvAPUUGDG+I+H2bZMbeUU+JclGJrvzhBkR figvhIXOqpkpzf8ILGI+0fY3YWUnQh+Z+7r87lVEIqbmgorGvMr3dN05wtfbNEyT4nEka4zPoOsdQV/MTGPrAISdzpnVTHGMSMY3pzz2WsP1TKAhJhYkJtqO ARXjml7+9/317y6MKPKiXy17cc+p3e6kBeCZ4QEzBClNXMERdQ6x818/WBf/5jrzy2H7OEQdrjOWUtatGXhD9rik+XVsX7w6i6ZFuAIKpWBY+SsKnr2zbv+n 2AVmogFB X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 05 Nov 2017 01:44:00 -0000 In message , Bryan Drewery wr ites: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --jd5aa1W7povpBFPr1nqjb2xhVAv2QJAJI > Content-Type: multipart/mixed; boundary="a4v8qebmubPimsLtRnfCw0RINtwFC8x8D"; > protected-headers="v1" > From: Bryan Drewery > To: Cy Schubert > Cc: "O. Hartmann" , "Simon J. Gerraty" > , svn-src-head@freebsd.org, svn-src-all@freebsd.org, > src-committers@freebsd.org > Message-ID: > Subject: Re: svn commit: r325404 - head/share/mk > References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> > > In-Reply-To: > > --a4v8qebmubPimsLtRnfCw0RINtwFC8x8D > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > On 11/4/2017 4:57 PM, Bryan Drewery wrote: > > On 11/4/2017 3:30 PM, Cy Schubert wrote: > >> In message <0fc7e918-dcf8-0197-6b50-5936dee23d87@FreeBSD.org>, Bryan=20 > >> Drewery wr > >> ites: > >>> This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > >>> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD > >>> Content-Type: multipart/mixed; boundary=3D"MKHGkKGfLlBFL1Vl1W5AEj2Bcc= > B14C28h"; > >>> protected-headers=3D"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=3Dutf-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: > >>>> =3D20 > >>>>> 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 > >>>>>> =3D20 > >>>>>> If for any reason we cannot set .OBJDIR=3D3D=3D3D_objdir as desi= > red > >>>>>> use .CURDIR so that at least the classic > >>>>>> .if ${.OBJDIR} !=3D3D ${.CURDIR} > >>>>>> works and dangerous misstakes can be avoided. > >>>>>> =3D20 > >>>>>> Reviewed by: bdrewery > >>>>>> > >>>>>> Modified: > >>>>>> head/share/mk/auto.obj.mk > >>>>>> > >>>>>> Modified: head/share/mk/auto.obj.mk > >>>>>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= > 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > >>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= > D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > >>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= > D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > >>> =3D3D=3D3D=3D3D=3D3D=3D3D > >>>>>> --- 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 !=3D3D echo ${__objdir}/; umask = > ${OBJ=3D > >>> DIR_UMA > >>>>>> .endif > >>>>>> # This causes make to use the specified directory as .OBJDIR > >>>>>> .OBJDIR: ${__objdir} > >>>>>> -.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA} && ${__objdir_made:Uno:M$= > {__ob=3D > >>> jdir}/*} !=3D3D "" > >>>>>> +.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA} > >>>>>> +# we did not get what we want - do we care? > >>>>>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D3D "" > >>>>>> # watch out for __objdir being relative path > >>>>>> .if !(${__objdir:M/*} =3D3D=3D3D "" && ${.OBJDIR:tA} =3D3D=3D3D $= > {${.CURDIR}=3D > >>> /${__objdir}:L:tA}) > >>>>>> .error could not use ${__objdir}: .OBJDIR=3D3D${.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= > =2Eor=3D > >>> g" =3D20 > >>>>> > >>>>> With the recent patches, nvidia driver x11/nvidia-driver fails tobu= > ild=3D > >>> with the error > >>>>> shown below: > >>>>> > >>>>> [...] > >>>>> =3D3D=3D3D=3D3D> src/nvidia (all) =3D20 > >>>>> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditio= > nal=3D > >>> > >>>>> (${CANONICALOBJDIR} =3D3D=3D3D /${RELDIR} || ${.OBJDIR} =3D3D=3D3D = > /${RELDIR})=3D > >>> make[7]: Fatal errors > >>>>> encountered -- cannot continue > >>>>> [...] > >>>> =3D20 > >>>> The very same with emulators/virtualbox-ose-kmod: > >>>> =3D20 > >>>> [...] > >>>> kBuild: > >>>> Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators= > /vi=3D > >>> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin= > /src=3D > >>> /vboxdrv/Makefile > >>>> =3D3D=3D3D=3D3D Building 'vboxdrv' module =3D3D=3D3D=3D3D make[6]: "= > /usr/src/share/=3D > >>> mk/bsd.obj.mk" line 87: > >>>> Malformed conditional (${CANONICALOBJDIR} =3D3D=3D3D /${RELDIR} || $= > {.OBJDI=3D > >>> R} =3D3D=3D3D /${RELDIR}) > >>>> make[6]: Fatal errors encountered -- cannot continue make[6]: stoppe= > d > >>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtual= > box=3D > >>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vbo= > xdrv=3D > >>> > >>>> *** Error code 1 > >>>> =3D20 > >>>> Stop. > >>>> make[5]: stopped > >>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtual= > box=3D > >>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src > >>>> =3D3D=3D3D=3D3D> Compilation failed unexpectedly. Try to set MAKE_JO= > BS_UNSAFE=3D > >>> =3D3Dyes and rebuild before > >>>> reporting the failure to the maintainer. > >>>> *** Error code 1 > >>>> =3D20 > >>>> =3D20 > >>> > >>> 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=20 > >> incorrectly set to /etc/autofs > >> > >> *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install fil= > es to > >> the temproot environment > >> > >> > >=20 > > That's actually a good thing. What command did you run? > >=20 > > I got ahead of myself with the assertion in r325405 since the bug wasn't > fully fixed yet, but I'm glad the assertion works properly. > > The mergemaster issue is now fixed in r325416. It works now, thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.