svn commit: r215309 - in head/sys: amd64/amd64 i386/i386 sys vm

[Anonymous]

Kostik Belousov <kostikbel at gmail.com> writes:

> On Mon, Nov 15, 2010 at 12:20:37AM +0300, Anonymous wrote:
>> Konstantin Belousov <kib at FreeBSD.org> writes:
>> 
>> > Author: kib
>> > Date: Sun Nov 14 18:24:12 2010
>> > New Revision: 215309
>> > URL: http://svn.freebsd.org/changeset/base/215309
>> >
>> > Log:
>> >   Use symbolic names instead of hardcoding values for magic p_osrel constants.
>> >   
>> >   MFC after:   1 week
>> [...]
>> > Modified: head/sys/sys/param.h
>> > ==============================================================================
>> > --- head/sys/sys/param.h	Sun Nov 14 18:05:03 2010	(r215308)
>> > +++ head/sys/sys/param.h	Sun Nov 14 18:24:12 2010	(r215309)
>> > @@ -60,6 +60,11 @@
>> >  #undef __FreeBSD_version
>> >  #define __FreeBSD_version 900025	/* Master, propagated to newvers */
>> >  
>> > +#ifdef _KERNEL
>> > +#define	__FreeBSD_version_SIGSEGV	700004
>> > +#define	__FreeBSD_version_MAP_ANON	800104
>> > +#endif
>> > +
>> 
>> This breaks bsd.port.mk regexp to determine OSVERSION.
[...]
>> 
>>  $ make -C devel/libpthread-stubs
>>   "Makefile", line 26: warning: String comparison operator should be either == or !=
>>   "Makefile", line 26: Malformed conditional (${OSVERSION} < 700000)
>>   "Makefile", line 28: if-less endif
>>   "/usr/ports/Mk/bsd.port.mk", line 1739: warning: String comparison operator should be either == or !=
>>   "/usr/ports/Mk/bsd.port.mk", line 1739: Malformed conditional (defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 ))
>>   "/usr/ports/Mk/bsd.port.mk", line 6394: if-less endif
>>   make: fatal errors encountered -- cannot continue
[...]
> I think it is better to select different namespace for the special versions.
> Can you confirm that the following patch fixes the ports mk for you ?
> It is enough to cd /usr/src/include && make install after patching.
[...]
> diff --git a/sys/sys/param.h b/sys/sys/param.h
> index 3e4cdf6..ea90308 100644
> --- a/sys/sys/param.h
> +++ b/sys/sys/param.h
> @@ -61,8 +61,8 @@
>  #define __FreeBSD_version 900025	/* Master, propagated to newvers */
>  
>  #ifdef _KERNEL
> -#define	__FreeBSD_version_SIGSEGV	700004
> -#define	__FreeBSD_version_MAP_ANON	800104
> +#define	P_OSREL_SIGSEGV		700004
> +#define	P_OSREL_MAP_ANON	800104
>  #endif

Yep, it does fix.