Date: Fri, 5 Mar 2004 17:22:47 +0200 From: Ruslan Ermilov <ru@FreeBSD.ORG> To: Andrey Chernov <ache@nagual.pp.ru>, src-committers@FreeBSD.ORG, cvs-src@FreeBSD.ORG, cvs-all@FreeBSD.ORG Cc: David O'Brien <obrien@FreeBSD.ORG> Subject: Re: cvs commit: src/gnu/usr.bin/binutils Makefile.inc0 Message-ID: <20040305152247.GB11063@ip.net.ua> In-Reply-To: <20040305143708.GA70192@nagual.pp.ru> References: <200403050147.i251l39I006593@repoman.freebsd.org> <200403042036.i24KaIeq025097@repoman.freebsd.org> <20040305141012.GA10639@ip.net.ua> <20040305143708.GA70192@nagual.pp.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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)
>
> Why you decide, it requires sys/types.h?
>
Oops, I meant <regex.h> here.
In RELENG_4, including <regex.h> requires including <sys/types.h>,
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.
>
> I don't see any principal difficulties here.
> I use CFLAGS +=, so if you add -I.../legacy/... as first thing to CFLAGS
> (i.e. before mine one), your includes will be picked first.
>
But it's added last, by the special version of <bsd.prog.mk> from
src/tools/build/mk/.
> > Please find some other way to fix this.
>
> I see no other way to fix it until David will remove getopt* from
> binutil's contrib.
>
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,
--
Ruslan Ermilov
FreeBSD committer
ru@FreeBSD.org
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFASJtHUkv4P6juNwoRAm0nAJ9gShWvzP804CDifLv8oaUd2o5bFACgg6sN
aGbqJ+UO6PfFL4t6151KVms=
=nqzK
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040305152247.GB11063>