Date: Mon, 30 May 2005 21:46:19 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.org Subject: Re: .depend line 264: Inconsistent operator for ipf Message-ID: <20050530184619.GB57333@ip.net.ua> In-Reply-To: <20050530183906.GA66808@xor.obsecurity.org> References: <20050528153155.GA75114@kukulies.org> <20050530112210.GG54585@ip.net.ua> <20050530183906.GA66808@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--GID0FwUMdk1T2AWN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, May 30, 2005 at 11:39:06AM -0700, Kris Kennaway wrote:
> On Mon, May 30, 2005 at 02:22:10PM +0300, Ruslan Ermilov wrote:
>=20
> > When someone changes the type of "foo" from file to directory,
> > this is exactly what happens. sbin/ipf/ipf was a file, which
> > has a recorded dependency in your stale .depend file. Now,
> > sbin/ipf/ipf is a directory, and it has a :: type of dependency
> > provided by bsd.subdir.mk in sbin/ipf/Makefile, hence the error
> > from make(1). Just blow away your /usr/obj/usr/src/sbin/ipf.
> > I'm considering changing bsd.subdir.mk to prevent this from
> > happening again and again.
>=20
> That would probably be a good idea..this question will surely come up
> again and again each time someone tries to update from 5.x to 6.x.
>=20
The patch I'm testing now is very simple:
%%%
Index: bsd.subdir.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
RCS file: /home/ncvs/src/share/mk/bsd.subdir.mk,v
retrieving revision 1.49
diff -u -r1.49 bsd.subdir.mk
--- bsd.subdir.mk 14 Feb 2005 12:57:51 -0000 1.49
+++ bsd.subdir.mk 30 May 2005 11:21:00 -0000
@@ -57,7 +57,7 @@
done
.endif
=20
-${SUBDIR}::
+${SUBDIR}:
${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
else \
%%%
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--GID0FwUMdk1T2AWN
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iD8DBQFCm197qRfpzJluFF4RAtjIAKCQbrKH1M/UM4tTo1Ypq2jUfNkZkgCgmrj7
iN7sDjNJpkpIu1ndOoSJ2dA=
=ObbS
-----END PGP SIGNATURE-----
--GID0FwUMdk1T2AWN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050530184619.GB57333>