Date: Sun, 5 Nov 2017 08:25:49 -0800 From: David Wolfskill <david@catwhisker.org> To: "Simon J. Gerraty" <sjg@juniper.net> Cc: current@freebsd.org Subject: Re: Build failed: /usr/src/share/mk/bsd.obj.mk" line 89: Malformed conditional Message-ID: <20171105162549.GG1156@albert.catwhisker.org> In-Reply-To: <13456.1509898407@kaos.jnpr.net> References: <20171105124444.GG1156@albert.catwhisker.org> <13241.1509897599@kaos.jnpr.net> <13456.1509898407@kaos.jnpr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--bmlge7Pg4VPvffji
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Nov 05, 2017 at 08:13:27AM -0800, Simon J. Gerraty wrote:
> Simon J. Gerraty <sjg@juniper.net> wrote:
> ...
> > I think I might have a fix for that.
>=20
> Or rather I know what the issue is - RELDIR isn't defined because
> .CURDIR isn't under SRCTOP,
> if OBJTOP were defined at that point, the fix is trivial, but
> in the current tree that may not be so.
> If .CURDIR isn't under SRCTOP, RELDIR is of questionable value anyway.
>=20
> For now you can avoid the error with below.
>=20
> Index: share/mk/bsd.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
> --- share/mk/bsd.obj.mk (revision 325436)
> +++ share/mk/bsd.obj.mk (working copy)
> @@ -85,7 +85,7 @@
> CANONICALOBJDIR:=3D/usr/obj${.CURDIR}
> .endif
> =20
> -.if defined(SRCTOP) && \
> +.if defined(RELDIR) && \
> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR=
})
> .error .OBJDIR incorrectly set to /${RELDIR}
> .endif
>=20
I had checked the svn-head before I saw the above, and noted bdrewery@'s
mention of:
Index: share/mk/bsd.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
--- share/mk/bsd.obj.mk (revision 325433)
+++ share/mk/bsd.obj.mk (working copy)
@@ -85,7 +85,7 @@
CANONICALOBJDIR:=3D/usr/obj${.CURDIR}
.endif
=20
-.if defined(SRCTOP) && \
+.if defined(SRCTOP) && defined(RELDIR) && \
(${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})
.error .OBJDIR incorrectly set to /${RELDIR}
.endif
which I just tried, and that got through the issue:
FreeBSD g1-252.catwhisker.org 12.0-CURRENT FreeBSD 12.0-CURRENT #3 r325433=
M/325433:1200052: Sun Nov 5 04:27:43 PST 2017 root@g1-252.catwhisker.o=
rg:/common/S4/obj/usr/src/amd64.amd64/sys/CANARY amd64
Peace,
david
--=20
David H. Wolfskill david@catwhisker.org
Unsubstantiated claims of "Fake News" are evidence that the claimant lies a=
gain.
See http://www.catwhisker.org/~david/publickey.gpg for my public key.
--bmlge7Pg4VPvffji
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQF8BAEBCgBmBQJZ/zuNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDQ0I3Q0VGOTE3QTgwMUY0MzA2NEQ3N0Ix
NTM5Q0M0MEEwNDlFRTE3AAoJEBU5zECgSe4XB5cH/3PxzqGamPfjfydZi/5/NOSL
I0AwahpIPA6kheyI1+6ZHocujAqsPiPJfC0N7JNIv+pbTXnV2t2zoo0oKwKeWEHw
UtTa7ZamtcOx0El/GkX5OREGQ7Sma75kN4IiMuG/NzZSYadc0E2pMmUsV5EnMCKF
vFAJCx7JjwCeoj8SeCaVeTZSLnjtjB+8e+7NMaM+dHiptNQnk62XXVvDhE4YrnF1
aucspO5P6DQDL8fvTCYS+RdEnWhKDuDGjTEmPiykdp97fawfD0C/o8eWgTm+OWjG
P90tYSqnto1Zq1B0KZ+N50p30oBpU7g+XEiHOt7SZDp3orkrPIwSA45oM5Lxpjk=
=EC6Q
-----END PGP SIGNATURE-----
--bmlge7Pg4VPvffji--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171105162549.GG1156>