[PATCH xserver] Replace deprecated CWARNFLAGS with BASE_CFLAGS and NO_STRICT_ALIASING_CFLAG

[Peter Hutterer]

On Wed, Dec 07, 2011 at 08:17:28PM -0500, Gaetan Nadon wrote:
> This patch makes use of the new functions in util-macros 1.16.
> CWARNGLAGS is left as is for backward compatibility but will no longer
> be maintained.
> 
> Modules should migrate to the new BASE_CFLAGS variable and establish
> if they really do need the "no strict aliasing" or if it was there
> because they were no aware of it.

series:
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>


> 
>  XORG_CWARNFLAGS
>  ---------------
>  Minimum version: 1.2.0
>  Deprecated since: 1.16.0 (Use XORG_COMPILER_FLAGS instead)
> 
>  Defines CWARNFLAGS to enable C compiler warnings.
> 
>  This function is deprecated because it defines -fno-strict-aliasing
>  which alters the code generated by the compiler.  If -fno-strict-aliasing
>  is needed, then it should be added explicitly in the module when
>  it is updated to use BASE_CFLAGS.
> 
> This patch requires util-macros version1.16.0 which provides the following:
> Alan Coopersmith (4):
>       Add an optional argument to XORG_LD_WRAP
>       Define __wrap_exit in test program source for XORG_LD_WRAP
>       Add XORG_MEMORY_CHECK_FLAGS and require it in XORG_ENABLE_UNIT_TESTS
>       XORG_TESTSET_CFLAG: Try to both compile & link with the flags
> 
> Jeremy Huddleston (7):
>       Fix the test for -Werror=attributes
>       Add XORG_TESTSET_CFLAG which can be used to test what flags the compiler supports
>       Use XORG_TESTSET_CFLAG in XORG_STRICT_OPTION
>       Add XORG_COMPILER_FLAGS to replace XORG_CWARNFLAGS
>       Update XORG_CWARNFLAGS to use XORG_COMPILER_FLAGS
>       Add additional flags to XORG_COMPILER_FLAGS
>       XORG_TESTSET_CFLAG: Add support fot -Werror=unused-command-line-argument
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  configure.ac |   18 +++++++-----------
>  1 files changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 27bf7db..6bc1e5e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -32,10 +32,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
>  AM_INIT_AUTOMAKE([foreign dist-bzip2])
>  AM_MAINTAINER_MODE
>  
> -# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
> +# Require xorg-macros minimum of 1.16 for XORG_COMPILER_FLAGS in XORG_DEFAULT_OPTIONS
>  m4_ifndef([XORG_MACROS_VERSION],
> -          [m4_fatal([must install xorg-macros 1.14 or later before running autoconf/autogen])])
> -XORG_MACROS_VERSION(1.14)
> +          [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
> +XORG_MACROS_VERSION(1.16)
>  XORG_DEFAULT_OPTIONS
>  XORG_WITH_DOXYGEN(1.6.1)
>  XORG_CHECK_SGML_DOCTOOLS(1.8)
> @@ -82,15 +82,11 @@ AC_PROG_YACC
>  AC_SYS_LARGEFILE
>  XORG_PROG_RAWCPP
>  
> -# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
> +# Quoted so that make will expand $(BASE_CFLAGS) in makefiles to allow
>  # easier overrides at build time.
> -XSERVER_CFLAGS='$(CWARNFLAGS)'
> -
> -dnl Explicitly add -fno-strict-aliasing since this option should disappear
> -dnl from util-macros CWARNFLAGS
> -if  test "x$GCC" = xyes ; then
> -    XSERVER_CFLAGS="$XSERVER_CFLAGS -fno-strict-aliasing"
> -fi
> +XORG_TESTSET_CFLAG([NO_STRICT_ALIASING_CFLAG], [-fno-strict-aliasing])
> +XSERVER_CFLAGS='$(BASE_CFLAGS) $(NO_STRICT_ALIASING_CFLAG)'
> +AC_SUBST([NO_STRICT_ALIASING_CFLAG])
>  
>  dnl Check for dtrace program (needed to build Xserver dtrace probes)
>  dnl Also checks for <sys/sdt.h>, since some Linux distros have an 
> -- 
> 1.7.4.1
>