[PATCH] Use the right variable names for the compiler flags in XORG_TESTSET_CFLAGS

[Sedat Dilek]

On Mon, Aug 5, 2013 at 5:52 PM, Sedat Dilek <sedat.dilek at gmail.com> wrote:
> On Mon, Aug 5, 2013 at 5:08 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
>> Whilst populating the xorg_cv_ cache entries, and the subsequent
>> xorg_testset_, we always include the FLAG_PREFIX in the name, to
>> distinguish between C and C++ iterations. However, in the body of the
>> test function, we dropped the FLAG_PREFIX expansion and so always used
>> the empty string and hence did not correctly detect incorrect flags.
>>
>> The bug was introduced with
>> commit 51f69514e65637f575df901ef942515e70314f6a
>> Author: Chase Douglas <chase.douglas at canonical.com>
>> Date:   Mon Mar 12 11:49:28 2012 -0700
>>
>>     Separate unknown warning options by language
>>
>> Reported-by: Sedat Dilek <sedat.dilek at gmail.com>
>> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
>> Cc: Sedat Dilek <sedat.dilek at gmail.com>
>> Cc: Chase Douglas <chase.douglas at canonical.com>
>> Cc: Gaetan Nadon<memsize at videotron.ca>
>> ---
>
> Tested-by: Sedat Dilek <sedat.dilek at gmail.com> [ as told on intel-gfx ML ]
>
> Can you unify and beautify the output?
>
> checking if clang supports[space]... <--- [space] is not always seen
> in the output!
>

That seems to do the trick here:

[ /usr/share/aclocal/xorg-macros.m4 ]

 dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
-               AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+               AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
                cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
                AC_CACHE_VAL($cacheid,
                             [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],

$ grep ^'checking if clang supports'
logs/build-and-install-log_XF86-Video-Intel-v2-21-14_issues-fixed-beautified-output_llvm-3-3.txt
| grep Wno
checking if clang supports -Wno-cast-qual... yes
checking if clang supports -Wno-redundant-decls... yes
checking if clang supports -Wno-maybe-uninitialized... no

Chris, you want a separate fix or fold this into this one and send a v2?

- Sedat -

> $ grep ^'checking if clang supports'
> logs/build-and-install-log_XF86-Video-Intel-v2-21-14_issues-fixed_llvm-3-3.txt
> checking if clang supports -Werror=unknown-warning-option... yes
> checking if clang supports -Werror=unused-command-line-argument... yes
> checking if clang supports-Wall... yes
> checking if clang supports-Wpointer-arith... yes
> checking if clang supports-Wmissing-declarations... yes
> checking if clang supports-Wformat=2... yes
> checking if clang supports-Wstrict-prototypes... yes
> checking if clang supports-Wmissing-prototypes... yes
> checking if clang supports-Wnested-externs... yes
> checking if clang supports-Wbad-function-cast... yes
> checking if clang supports-Wold-style-definition... yes
> checking if clang supports-Wdeclaration-after-statement... yes
> checking if clang supports-Wunused... yes
> checking if clang supports-Wuninitialized... yes
> checking if clang supports-Wshadow... yes
> checking if clang supports-Wcast-qual... yes
> checking if clang supports-Wmissing-noreturn... yes
> checking if clang supports-Wmissing-format-attribute... yes
> checking if clang supports-Wredundant-decls... yes
> checking if clang supports-Werror=implicit... yes
> checking if clang supports-Werror=nonnull... yes
> checking if clang supports-Werror=init-self... yes
> checking if clang supports-Werror=main... yes
> checking if clang supports-Werror=missing-braces... yes
> checking if clang supports-Werror=sequence-point... yes
> checking if clang supports-Werror=return-type... yes
> checking if clang supports-Werror=trigraphs... yes
> checking if clang supports-Werror=array-bounds... yes
> checking if clang supports-Werror=write-strings... yes
> checking if clang supports-Werror=address... yes
> checking if clang supports-Werror=int-to-pointer-cast... yes
> checking if clang supports-Werror=pointer-to-int-cast... yes
> checking if clang supports-pedantic... yes
> checking if clang supports-Werror... yes
> checking if clang supports-Werror=attributes... yes
> checking if clang supports-Wno-cast-qual... yes
> checking if clang supports-Wno-redundant-decls... yes
> checking if clang supports-Wno-maybe-uninitialized... no
> checking if clang supports -fno-rtti -fno-exceptions... yes
> checking if clang supports -c -o file.o... yes
> checking if clang supports -c -o file.o... (cached) yes
>
> - Sedat -
>
>>  xorg-macros.m4.in | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
>> index d589ebd..cd76fca 100644
>> --- a/xorg-macros.m4.in
>> +++ b/xorg-macros.m4.in
>> @@ -1543,11 +1543,11 @@ fi
>>  found="no"
>>  m4_foreach([flag], m4_cdr($@), [
>>         if test $found = "no" ; then
>> -               if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
>> +               if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
>>                         PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
>>                 fi
>>
>> -               if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
>> +               if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
>>                         PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
>>                 fi
>>
>> --
>> 1.8.4.rc1
>>