svn commit: r325404 - head/share/mk

Sat Nov 4 22:30:48 UTC 2017

In message <0fc7e918-dcf8-0197-6b50-5936dee23d87 at FreeBSD.org>, Bryan 
Drewery wr
ites:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
> Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
>  protected-headers="v1"
> From: Bryan Drewery <bdrewery at FreeBSD.org>
> To: "O. Hartmann" <ohartmann at walstatt.org>, "Simon J. Gerraty"
>  <sjg at FreeBSD.org>
> Cc: svn-src-head at freebsd.org, svn-src-all at freebsd.org,
>  src-committers at freebsd.org
> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23d87 at FreeBSD.org>
> Subject: Re: svn commit: r325404 - head/share/mk
> References: <201711042102.vA4L2RuR063978 at repo.freebsd.org>
>  <20171104223133.00f5bf30 at thor.intern.walstatt.dynvpn.de>
>  <20171104223650.77c06a52 at thor.intern.walstatt.dynvpn.de>
> In-Reply-To: <20171104223650.77c06a52 at thor.intern.walstatt.dynvpn.de>
> 
> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
> Content-Type: text/plain; charset=utf-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 at walstatt.org> schrieb:
> >=20
> >> Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC)
> >> "Simon J. Gerraty" <sjg at 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	(r32540
> 3)
> >>> +++ head/share/mk/auto.obj.mk	Sat Nov  4 21:02:26 2017	(r32540
> 4)
> >>> @@ -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 at freebsd.org mailing list
> >>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >>> To unsubscribe, send any mail to "svn-src-head-unsubscribe at 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
> > The very same with 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 87:
> > Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
> R} =3D=3D /${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
> >=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
> 
> 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 files to
      the temproot environment

-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.