From owner-freebsd-current@FreeBSD.ORG Mon May 30 18:45:59 2005 Return-Path: X-Original-To: current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC29316A41C for ; Mon, 30 May 2005 18:45:59 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1483443D1F for ; Mon, 30 May 2005 18:45:58 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j4UIjue3040448; Mon, 30 May 2005 21:45:56 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 94044-14; Mon, 30 May 2005 21:45:55 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j4UIjtUW040445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 30 May 2005 21:45:55 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j4UIkJUK057485; Mon, 30 May 2005 21:46:19 +0300 (EEST) (envelope-from ru) Date: Mon, 30 May 2005 21:46:19 +0300 From: Ruslan Ermilov To: Kris Kennaway Message-ID: <20050530184619.GB57333@ip.net.ua> References: <20050528153155.GA75114@kukulies.org> <20050530112210.GG54585@ip.net.ua> <20050530183906.GA66808@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GID0FwUMdk1T2AWN" Content-Disposition: inline In-Reply-To: <20050530183906.GA66808@xor.obsecurity.org> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: current@FreeBSD.org Subject: Re: .depend line 264: Inconsistent operator for ipf X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 18:45:59 -0000 --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--