Date: Sun, 5 Nov 2017 08:00:48 -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: <7d0c021d-fe3d-9bea-b088-5e530176288b@FreeBSD.org> In-Reply-To: <20171105111644.4c294342@thor.intern.walstatt.dynvpn.de> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> <20171105111644.4c294342@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --W8eaWABA1WToX1gRufsQk7XpqwtgigEVN Content-Type: multipart/mixed; boundary="aCbdaR2UR1q8LiasSPAJ9h9GogOhI1oKG"; 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: <7d0c021d-fe3d-9bea-b088-5e530176288b@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> In-Reply-To: <20171105111644.4c294342@thor.intern.walstatt.dynvpn.de> --aCbdaR2UR1q8LiasSPAJ9h9GogOhI1oKG Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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: >=20 >> 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 ${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 > Not really solved for me: >=20 > [...] > =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 /${RELDI= R})) make[7]: Fatal errors > encountered -- cannot continue > [...] >=20 >=20 > Is there something I miss here? >=20 > Same for emulators/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 89: > Malformed conditional (defined(SRCTOP) && (${CANONICALOBJDIR} =3D=3D /= ${RELDIR} || > ${.OBJDIR} =3D=3D /${RELDIR})) make[6]: Fatal errors encountered -- can= not 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 > By the way: both kernel modules are build with=20 >=20 > [...] > PORTS_MODULES+=3D x11/nvidia-driver > PORTS_MODULES+=3D emulators/virtualbox-ose-kmod > [...] >=20 > in /etc/src.conf >=20 >=20 > Do I miss something or is this a bug? >=20 Weird, can you try this please? http://dpaste.com/3HR1EQH.txt >=20 > Kind regards, >=20 > Oliver >=20 --=20 Regards, Bryan Drewery --aCbdaR2UR1q8LiasSPAJ9h9GogOhI1oKG-- --W8eaWABA1WToX1gRufsQk7XpqwtgigEVN 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/zWxAAoJEDXXcbtuRpfPjmoIAJIbT79gF6Fw3DYbA4LSRMMR huYzzNqyGgj3ouiQDYedxpF4KySYFGRGsfI4jojYNy3BzX44qJMB7ldDT6UbYmQX ncwuhJfvVzYGxuaoXw+8bVWd7A92mtogADb5Td8wm39793MMmLnwd+eUWugIDU9Z YRN993sUY4aDqyM7ghNRyAYFKmPoFlyLBUJCc62cPiEkHDqUXJ9Jd94D+nW3BL+i 6saxTI6y9X3ELeIrR6az/Ro9/TIWggHckZtzlnPpuwQUjANfty5USzAeOfveOXg7 dIUtbc5d7v85RZe5wEUppu/ouOP5aXj2tSeGsAwfs9PnOa/9I1CqS9XoczpnTAk= =V5ZQ -----END PGP SIGNATURE----- --W8eaWABA1WToX1gRufsQk7XpqwtgigEVN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7d0c021d-fe3d-9bea-b088-5e530176288b>