cvs commit: src/sys/conf kern.pre.mk

Nate Lawson nate at root.org
Mon Oct 24 23:17:05 PDT 2005


David O'Brien wrote:
> On Mon, Oct 24, 2005 at 10:11:04AM -0600, Scott Long wrote:
> 
>>David E. O'Brien wrote:
>>
>>>obrien      2005-10-24 04:40:38 UTC
>>>
>>> FreeBSD src repository
>>>
>>> Modified files:
>>>   sys/conf             kern.pre.mk 
>>> Log:
>>> We no longer need INCLUDES+= -I$S/contrib/dev/acpica.
>>> 
>>> Revision  Changes    Path
>>> 1.73      +2 -5      src/sys/conf/kern.pre.mk
>>
>>Why is this so important?  Why is it worth conflicts with vendor code?
> 
> 
> How does it conflict with vendor code?
> See the recient archives of why it is wrong to have -I's in kern.pre.mk
> and how it only started in BSD .mk files when msmith imported acpica
> (Makefile.i386 rev 2.111).
> [only to later start mundging the files before importing them.]
> 
> Warner also seems to have thought it wasn't good to polute the build of
> all files with global -I's:
> 
>     RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
>     ..
>     revision 1.265
>     date: 2005/04/13 14:49:57;  author: imp;  state: Exp;  lines: +0 -2
>     ..
>     Also, move the -I stuff to the centralized kern.pre.mk.  However, it
>     might be better to add these flags to files.conf.
>     ..

I think this is a pretty minor gain also.  There are other similar areas 
that could benefit much more from some Makefile-reworking (especially 
the handling for .m files at the top of sys/conf/files).

However, since we already bash the acpi-ca distro with a hammer (see 
acpica_prep.sh), this was a minor enough change to tolerate.

-Nate


More information about the cvs-src mailing list