From owner-svn-src-head@freebsd.org Sat Nov 4 23:58:09 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 7F9B9E5A302; Sat, 4 Nov 2017 23:58:09 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F61C63557; Sat, 4 Nov 2017 23:58:09 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 7E049158AA; Sat, 4 Nov 2017 23:58:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 84A579101; Sat, 4 Nov 2017 23:58:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id HhKbPVbQhZOw; Sat, 4 Nov 2017 23:57:58 +0000 (UTC) Subject: Re: svn commit: r325404 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 48D0C90FC To: Cy Schubert Cc: "O. Hartmann" , "Simon J. Gerraty" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Sat, 4 Nov 2017 16:57:41 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711042230.vA4MUhjw014138@slippy.cwsent.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wjutQoc08VFbVHVqblHnIjkUIRRDidvKU" 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 23:58:09 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU Content-Type: multipart/mixed; boundary="w3owld0mRIX8gJLALiwWWQkk2reAm3Gik"; 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: <201711042230.vA4MUhjw014138@slippy.cwsent.com> --w3owld0mRIX8gJLALiwWWQkk2reAm3Gik Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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"MKHGkKGfLlBFL1Vl1W5AEj2BccB= 14C28h"; >> 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 desir= ed >>>>> 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=3D3D= =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=3D3D= =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.= or=3D >> g" =3D20 >>>> >>>> With the recent patches, nvidia driver x11/nvidia-driver fails tobui= ld=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 condition= al=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} || ${= =2EOBJDI=3D >> R} =3D3D=3D3D /${RELDIR}) >>> make[6]: Fatal errors encountered -- cannot continue make[6]: stopped= >>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualb= ox=3D >> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vbox= drv=3D >> >>> *** Error code 1 >>> =3D20 >>> Stop. >>> make[5]: stopped >>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualb= ox=3D >> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src >>> =3D3D=3D3D=3D3D> Compilation failed unexpectedly. Try to set MAKE_JOB= S_UNSAFE=3D >> =3D3Dyes and rebuild before >>> reporting the failure to the maintainer. >>> *** Error code 1 >>> =3D20 >>> =3D20 >> >> It was r325405 ... fixed in r325408. >=20 >=20 > Not really, mergemaster output. >=20 > *** Creating the temporary root environment in /tmp/temproot > *** /tmp/temproot ready for use > *** Creating and populating directory structure in /tmp/temproot >=20 > make[3]: "/opt/src/svn-current/share/mk/bsd.obj.mk" line 89: .OBJDIR=20 > incorrectly set to /etc/autofs >=20 > *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install file= s to > the temproot environment >=20 >=20 That's actually a good thing. What command did you run? --=20 Regards, Bryan Drewery --w3owld0mRIX8gJLALiwWWQkk2reAm3Gik-- --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZ/lP1AAoJEDXXcbtuRpfPjXYIAJ7GckKaUAQzZXsdoymyuFVu DUsqmEiCaM/s+qex1b07/yOoKnDeTB+HQzGBwB4XC0AeDLxEouGwBMNkL9Nmdztt sMt/NeLQdA2B0SX/0mPTV6YTnHng4AYL4k/ejiydGQnFo6qcSwh7UHVlYv5Uorrj ugm2cvf21mEqq8N6bgJdHKacN1QFZeYjmPxB6HkPnEL+WGs9T+CZbVkanjDB7D4A UMppzMFubBFmXQr5l3TCFVY5nmM60Fmy7qoZElt5BjsO88JJbAVbm9uzdf/nSzaf WPZ+XvW4+SB9Qj+xVTdZHEVLT0rE/wG6GVpxTjV3hm4i7qVhJTi7EQOb9vUpGp0= =gTwH -----END PGP SIGNATURE----- --wjutQoc08VFbVHVqblHnIjkUIRRDidvKU--