Date: Sat, 4 Nov 2017 17:13:17 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Don Lewis <truckman@FreeBSD.org> Cc: Cy Schubert <Cy.Schubert@komquats.com>, "O. Hartmann" <ohartmann@walstatt.org>, "Simon J. Gerraty" <sjg@FreeBSD.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <4622f043-cdb2-4929-eb59-9c82dc9afeaf@FreeBSD.org> In-Reply-To: <tkrat.ffd5604c2f811cb5@FreeBSD.org> References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> <feae74ef-d45c-e7cd-5d0f-021f47b97143@FreeBSD.org> <tkrat.ffd5604c2f811cb5@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eJpwhFHhVPSB1RfC4GtbBAnUmKcIJPhLf Content-Type: multipart/mixed; boundary="cVSGP9cfXLpwphhM0vl8JmLIKLonIrpDu"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Don Lewis <truckman@FreeBSD.org> Cc: Cy Schubert <Cy.Schubert@komquats.com>, "O. Hartmann" <ohartmann@walstatt.org>, "Simon J. Gerraty" <sjg@FreeBSD.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Message-ID: <4622f043-cdb2-4929-eb59-9c82dc9afeaf@FreeBSD.org> Subject: Re: svn commit: r325404 - head/share/mk References: <201711042230.vA4MUhjw014138@slippy.cwsent.com> <feae74ef-d45c-e7cd-5d0f-021f47b97143@FreeBSD.org> <tkrat.ffd5604c2f811cb5@FreeBSD.org> In-Reply-To: <tkrat.ffd5604c2f811cb5@FreeBSD.org> --cVSGP9cfXLpwphhM0vl8JmLIKLonIrpDu Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/4/2017 5:11 PM, Don Lewis wrote: > On 4 Nov, Bryan Drewery wrote: >> On 11/4/2017 3:30 PM, Cy Schubert wrote: >>> 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=3D"MKHGkKGfLlBFL1Vl1W5AEj2Bc= cB14C28h"; >>>> protected-headers=3D"v1" >>>> From: Bryan Drewery <bdrewery@FreeBSD.org> >>>> To: "O. Hartmann" <ohartmann@walstatt.org>, "Simon J. Gerraty" >>>> <sjg@FreeBSD.org> >>>> 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" <ohartmann@walstatt.org> schrieb: >>>>> =3D20 >>>>>> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) >>>>>> "Simon J. Gerraty" <sjg@FreeBSD.org> 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 des= ired >>>>>>> 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= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D >>>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=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=3D= 3D=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@freebs= d.or=3D >>>> g" =3D20 >>>>>> >>>>>> With the recent patches, nvidia driver x11/nvidia-driver fails tob= uild=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 conditi= onal=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/emulator= s/vi=3D >>>> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bi= n/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]: stopp= ed >>>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtua= lbox=3D >>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vb= oxdrv=3D >>>> >>>>> *** Error code 1 >>>>> =3D20 >>>>> Stop. >>>>> make[5]: stopped >>>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtua= lbox=3D >>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src >>>>> =3D3D=3D3D=3D3D> Compilation failed unexpectedly. Try to set MAKE_J= OBS_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 = >>> incorrectly set to /etc/autofs >>> >>> *** FATAL ERROR: Cannot 'cd' to /opt/src/svn-current and install fi= les to >>> the temproot environment >>> >>> >> >> That's actually a good thing. What command did you run? >=20 > I got the following when attempting to update a poudriere jail to > r325409: >=20 > --- obj_subdir_sys --- > make[5]: "/var/poudriere/jails/120CURRENTamd64/usr/src/share/mk/bsd.obj= =2Emk" line 89: .OBJDIR incorrectly set to /sys/boot/libsa > *** [obj_subdir_sys/boot/libsa] Error code 1 >=20 > make[4]: stopped in /var/poudriere/jails/120CURRENTamd64/usr/src/sys/bo= ot >=20 >=20 Should be fixed in r325416. --=20 Regards, Bryan Drewery --cVSGP9cfXLpwphhM0vl8JmLIKLonIrpDu-- --eJpwhFHhVPSB1RfC4GtbBAnUmKcIJPhLf 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/ledAAoJEDXXcbtuRpfPIAwIALDhX7l8dTjqf8xocy1RpCHV jgaxbDy6ShSnkC7O4TIhLEehKhJcCxZ3EVLCsqwJpm5WWU3bMa0q3iAMLq+S99/D d/7beZDqNYoFYj17PSwj7386KtLnY0dxaqNxGMBDa+SRFFlNU/bEZSeY4iugZAL2 DQnuxF4UWIL6XmlSLyabAmnArrqXJtESifPrnVByhNrnTOHAM3yf9uUNnfhdlYm6 1Mbd6VQtxUTqbfnBNajrb3J0XamKDCC87h6oBXDTVqZPjPba6fcjsTJVrETxjn6P P/eehMQEWcwPK/Ve9LKU0Hrt62vfZhwB33T+xINmMyb7ehW+nqo79gmZPXV/MD4= =r8aS -----END PGP SIGNATURE----- --eJpwhFHhVPSB1RfC4GtbBAnUmKcIJPhLf--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4622f043-cdb2-4929-eb59-9c82dc9afeaf>