svn commit: r250658 - in head: share/mk sys/conf tools/build/options

[Andre Oppermann]

On 15.05.2013 15:04, Brooks Davis wrote:
> Author: brooks
> Date: Wed May 15 13:04:10 2013
> New Revision: 250658
> URL: http://svnweb.freebsd.org/changeset/base/250658
>
> Log:
>    Add a new option WITHOUT_FORMAT_EXTENSIONS to disable flags related to
>    checking our kernel printf extensions.  This is useful to allow
>    compilers without these extensions to build kernels.
>
>    Sponsored by:	DARPA, AFRL

This breaks "make depend" at least on amd64:

"../../../conf/kern.mk", line 37: Malformed conditional (${MK_FORMAT_EXTENSIONS} == "no")
"../../../conf/kern.mk", line 39: if-less else
"../../../conf/kern.mk", line 41: if-less endif
make: fatal errors encountered -- cannot continue

-- 
Andre

> Added:
>    head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS   (contents, props changed)
> Modified:
>    head/share/mk/bsd.own.mk
>    head/sys/conf/kern.mk
>
> Modified: head/share/mk/bsd.own.mk
> ==============================================================================
> --- head/share/mk/bsd.own.mk	Wed May 15 08:38:49 2013	(r250657)
> +++ head/share/mk/bsd.own.mk	Wed May 15 13:04:10 2013	(r250658)
> @@ -268,6 +268,7 @@ __DEFAULT_YES_OPTIONS = \
>       ED_CRYPTO \
>       EXAMPLES \
>       FLOPPY \
> +    FORMAT_EXTENSIONS \
>       FORTH \
>       FP_LIBC \
>       FREEBSD_UPDATE \
>
> Modified: head/sys/conf/kern.mk
> ==============================================================================
> --- head/sys/conf/kern.mk	Wed May 15 08:38:49 2013	(r250657)
> +++ head/sys/conf/kern.mk	Wed May 15 13:04:10 2013	(r250658)
> @@ -5,7 +5,7 @@
>   #
>   CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
>   		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
> -		-Wundef -Wno-pointer-sign -fformat-extensions \
> +		-Wundef -Wno-pointer-sign ${FORMAT_EXTENTIONS} \
>   		-Wmissing-include-dirs -fdiagnostics-show-option \
>   		${CWARNEXTRA}
>   #
> @@ -29,7 +29,15 @@ NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-
>   # enough to error out the whole kernel build.  Display them anyway, so there is
>   # some incentive to fix them eventually.
>   CWARNEXTRA?=	-Wno-error-tautological-compare -Wno-error-empty-body \
> -		-Wno-error-parentheses-equality
> +		-Wno-error-parentheses-equality ${NO_WFORMAT}
> +.endif
> +
> +# External compilers may not support our format extensions.  Allow them
> +# to be disabled.  WARNING: format checking is disabled in this case.
> +.if ${MK_FORMAT_EXTENSIONS} == "no"
> +NO_WFORMAT=		-Wno-format
> +.else
> +FORMAT_EXTENTIONS=	-fformat-extensions
>   .endif
>
>   #
>
> Added: head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS	Wed May 15 13:04:10 2013	(r250658)
> @@ -0,0 +1,5 @@
> +.\" $FreeBSD$
> +Set to not enable
> +.Fl fformat-extensions
> +when compiling the kernel.
> +Also disables all format checking.
>
>