Date: Sun, 5 Nov 2017 08:29:16 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: "Simon J. Gerraty" <sjg@FreeBSD.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Cy Schubert <Cy.Schubert@komquats.com> Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <f24e1348-e425-2039-3836-2fa1f43dc4ec@FreeBSD.org> In-Reply-To: <7d0c021d-fe3d-9bea-b088-5e530176288b@FreeBSD.org> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> <20171105111644.4c294342@thor.intern.walstatt.dynvpn.de> <7d0c021d-fe3d-9bea-b088-5e530176288b@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) --EohwIQF03JfaPo245pW1U3EkWU5JgQ9dH Content-Type: multipart/mixed; boundary="saSNhhWvCoJ388o7KsEGpx1gHawX5Vc5k"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: "Simon J. Gerraty" <sjg@FreeBSD.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Cy Schubert <Cy.Schubert@komquats.com> Message-ID: <f24e1348-e425-2039-3836-2fa1f43dc4ec@FreeBSD.org> Subject: Re: svn commit: r325404 - head/share/mk References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> <20171105111644.4c294342@thor.intern.walstatt.dynvpn.de> <7d0c021d-fe3d-9bea-b088-5e530176288b@FreeBSD.org> In-Reply-To: <7d0c021d-fe3d-9bea-b088-5e530176288b@FreeBSD.org> --saSNhhWvCoJ388o7KsEGpx1gHawX5Vc5k Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/5/2017 8:00 AM, Bryan Drewery wrote: > On 11/5/2017 2:16 AM, O. Hartmann wrote: >> Am Sat, 4 Nov 2017 22:31:33 +0100 >> "O. Hartmann" <ohartmann@walstatt.org> schrieb: >> >>> 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 >>>> =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 (r325403) >>>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) >>>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OB= JDIR_UMA >>>> .endif >>>> # This causes make to use the specified directory as .OBJDIR >>>> .OBJDIR: ${__objdir} >>>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__o= bjdir}/*} !=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.o= rg" =20 >>> >>> With the recent patches, nvidia driver x11/nvidia-driver fails tobuil= d with the error >>> shown below: >>> >>> [...] >>> =3D=3D=3D> src/nvidia (all) =20 >>> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditiona= l >>> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR}= ) make[7]: Fatal errors >>> encountered -- cannot continue >>> [...] >> >> Not really solved for me: >> >> [...] >> =3D=3D=3D> src (all) >> =3D=3D=3D> src/nvidia (all) >> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 89: Malformed conditional= (defined(SRCTOP) >> && (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELD= IR})) make[7]: Fatal errors >> encountered -- cannot continue >> [...] >> >> >> Is there something I miss here? >> >> Same for emulators/emulators/virtualbox-ose-kmod >> >> [...] >> kBuild: >> Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/v= irtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/sr= c/vboxdrv/Makefile >> =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share= /mk/bsd.obj.mk" line 89: >> Malformed conditional (defined(SRCTOP) && (${CANONICALOBJDIR} =3D=3D = /${RELDIR} || >> ${.OBJDIR} =3D=3D /${RELDIR})) make[6]: Fatal errors encountered -- ca= nnot continue make[6]: >> stopped >> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbo= x-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdr= v >> *** Error code 1 >> >> Stop. >> make[5]: stopped >> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbo= x-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src >> =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAF= E=3Dyes and rebuild before >> reporting the failure to the maintainer. >> *** Error code 1 >> [...] >> >> >> By the way: both kernel modules are build with=20 >> >> [...] >> PORTS_MODULES+=3D x11/nvidia-driver >> PORTS_MODULES+=3D emulators/virtualbox-ose-kmod >> [...] >> >> in /etc/src.conf >> >> >> Do I miss something or is this a bug? >> >=20 > Weird, can you try this please? http://dpaste.com/3HR1EQH.txt >=20 >> dhw@ tested, ommitted in r325437. --=20 Regards, Bryan Drewery --saSNhhWvCoJ388o7KsEGpx1gHawX5Vc5k-- --EohwIQF03JfaPo245pW1U3EkWU5JgQ9dH 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/zxdAAoJEDXXcbtuRpfPL+0H/3Hfuv1V3yXcl2qY45hQXdOU ltas3+xpVqezOm40JAApszVwyxImIvSnUWH99ioQMPROpH5C4cdHGN6SMCYvNMoW uXZlj7VZovyun208dLaBWpR6SUzwJnaLjG/Dut+Oe/hA6w200NBGJ97p9VId7o5t plXeEgsDlhIhVI35R+uZLvdQ50WTVHGGBtloLZ2QPEaJE6z8+NhTp84gov+uRgs6 ZxWIDhtR1G8hXDkZHF7GWIzIoxQFZ/0ijMz+EOOl3jlYZUuOrgNZdnbWuz9kQ7kA Nm+REYXBPOFbm3/r0RHBN7QsPaX/lHSXZOP/OtQxSKM2yjAnR/FfNIEQVJeJZFU= =EDI+ -----END PGP SIGNATURE----- --EohwIQF03JfaPo245pW1U3EkWU5JgQ9dH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f24e1348-e425-2039-3836-2fa1f43dc4ec>