From owner-cvs-all@FreeBSD.ORG Fri Mar 5 07:23:01 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4D5116A4CE; Fri, 5 Mar 2004 07:23:01 -0800 (PST) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CEED43D2F; Fri, 5 Mar 2004 07:22:59 -0800 (PST) (envelope-from ru@ip.net.ua) Received: from heffalump.office.ipnet (heffalump.ip.net.ua [82.193.96.213] (may be forged)) by tigra.ip.net.ua (8.12.10/8.12.9) with ESMTP id i25FPtu8061778 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 5 Mar 2004 17:25:56 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.office.ipnet (8.12.11/8.12.11) id i25FMlIJ021237; Fri, 5 Mar 2004 17:22:47 +0200 (EET) (envelope-from ru) Date: Fri, 5 Mar 2004 17:22:47 +0200 From: Ruslan Ermilov To: Andrey Chernov , src-committers@FreeBSD.ORG, cvs-src@FreeBSD.ORG, cvs-all@FreeBSD.ORG Message-ID: <20040305152247.GB11063@ip.net.ua> References: <200403050147.i251l39I006593@repoman.freebsd.org> <200403042036.i24KaIeq025097@repoman.freebsd.org> <20040305141012.GA10639@ip.net.ua> <20040305143708.GA70192@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="uQr8t48UFsdbeI+V" Content-Disposition: inline In-Reply-To: <20040305143708.GA70192@nagual.pp.ru> User-Agent: Mutt/1.5.6i X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: David O'Brien Subject: Re: cvs commit: src/gnu/usr.bin/binutils Makefile.inc0 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2004 15:23:01 -0000 --uQr8t48UFsdbeI+V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 05, 2004 at 05:37:08PM +0300, Andrey Chernov wrote: > On Fri, Mar 05, 2004 at 04:10:12PM +0200, Ruslan Ermilov wrote: > > Adding -I${DESTDIR}/usr/include broke upgrades from 4.x because > > now /usr/include/getopt.h gets used (which requires sys/types.h) >=20 > Why you decide, it requires sys/types.h? >=20 Oops, I meant here. In RELENG_4, including requires including , to pick up the "off_t" type definition. This is also documented in the regex(3) manpage (in RELENG_4). > > instead of the proper one from ${WORLDTMP}/legacy/usr/include/, > > usually /usr/obj/usr/src/i386/legacy/usr/include/getopt.h. >=20 > I don't see any principal difficulties here. > I use CFLAGS +=3D, so if you add -I.../legacy/... as first thing to CFLAG= S=20 > (i.e. before mine one), your includes will be picked first. >=20 But it's added last, by the special version of from src/tools/build/mk/. > > Please find some other way to fix this. >=20 > I see no other way to fix it until David will remove getopt* from=20 > binutil's contrib. >=20 OK, I see. Removing the contrib/bintuils/include/getopt.h is the only real solution -- I've removed it locally and reverted these revisions, and it's now past that point. David, remove the damn header please. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --uQr8t48UFsdbeI+V Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFASJtHUkv4P6juNwoRAm0nAJ9gShWvzP804CDifLv8oaUd2o5bFACgg6sN aGbqJ+UO6PfFL4t6151KVms= =nqzK -----END PGP SIGNATURE----- --uQr8t48UFsdbeI+V--