cvs commit: src/gnu/usr.bin/binutils Makefile.inc0

[Ruslan Ermilov]

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 at FreeBSD.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040305/ad8ad6c9/attachment.bin