Date: Sat, 4 Nov 2017 22:36:50 +0100 From: "O. Hartmann" <ohartmann@walstatt.org> To: "Simon J. Gerraty" <sjg@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <20171104223650.77c06a52@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 > > > > If for any reason we cannot set .OBJDIR==_objdir as desired > > use .CURDIR so that at least the classic > > .if ${.OBJDIR} != ${.CURDIR} > > works and dangerous misstakes can be avoided. > > > > Reviewed by: bdrewery > > > > Modified: > > head/share/mk/auto.obj.mk > > > > Modified: head/share/mk/auto.obj.mk > > ============================================================================== > > --- 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 != echo ${__objdir}/; umask ${OBJDIR_UMA > > .endif > > # This causes make to use the specified directory as .OBJDIR > > .OBJDIR: ${__objdir} > > -.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != "" > > +.if ${.OBJDIR:tA} != ${__objdir:tA} > > +# we did not get what we want - do we care? > > +.if ${__objdir_made:Uno:M${__objdir}/*} != "" > > # watch out for __objdir being relative path > > .if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} == ${${.CURDIR}/${__objdir}:L:tA}) > > .error could not use ${__objdir}: .OBJDIR=${.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.org" > > With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with the error > shown below: > > [...] > ===> src/nvidia (all) > make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional > (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) make[7]: Fatal errors > encountered -- cannot continue > [...] The very same with emulators/virtualbox-ose-kmod: [...] kBuild: Installing /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/Makefile === Building 'vboxdrv' module === make[6]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) make[6]: Fatal errors encountered -- cannot 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 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 ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer. *** Error code 1 -- O. Hartmann Ich widerspreche der Nutzung oder Übermittlung meiner Daten für Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG). [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWf4y8gAKCRDS528fyFhY lLGxAfoDW2AwO61tZvPO+e/qBVKlKs/i/99jQtDP47nadpPKsNv20491sQtB4LEQ HCdfTiegkdQeuhbNm2cSnml8an2yAgCZwJAh/KHvM820fBzUcVJNjfJDq/cOmwI5 CtU+FppDWWZdf1fa8b+xn7nQGFqZK4FyggYmYM7kDLkiUXQS7N9K =gThS -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171104223650.77c06a52>