Fix build failure when passing --with-builderstring.
PATCH 1/1 Fix build failure when passing --with-builderstring.
If --with-builderstring="foo" is passed to configure (and sna enabled):
CC sna_driver.losrc/sna/sna_driver.c: In function 'sna_init_scrn':src/sna/sna_driver.c:1023:7: error: token ""foo"" is not valid in preprocessor expressions
Fix the missing defined() around the BUILDER_DESCRIPTION variable.
--- src/sna/sna_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
src/sna/sna_driver.c +1 -1
@@ -1020,7 +1020,7 @@ void sna_init_scrn(ScrnInfoPtr scrn, int entity_num)#if defined(USE_GIT_DESCRIBE )xf86DrvMsg (scrn->scrnIndex,X_INFO ,"SNA compiled from %s\n" , git_version); -#elif BUILDER_DESCRIPTION +#elif defined(BUILDER_DESCRIPTION )xf86DrvMsg (scrn->scrnIndex,X_INFO ,"SNA compiled: %s\n" ,BUILDER_DESCRIPTION );#endif
Signature · 1 line
1.7.7.1
Cyril Brulebois <[email protected]> (07/11/2011):
Quoted 27 lines
If --with-builderstring="foo" is passed to configure (and sna enabled):
CC sna_driver.losrc/sna/sna_driver.c: In function 'sna_init_scrn':src/sna/sna_driver.c:1023:7: error: token ""foo"" is not valid in preprocessor expressionsFix the missing
defined()around theBUILDER_DESCRIPTIONvariable.Signed-off-by Cyril Brulebois <[email protected]>--- src/sna/sna_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)src/sna/sna_driver.c +1
-1@@ -1020,7 +1020,7 @@ void sna_init_scrn(ScrnInfoPtr scrn, int entity_num)#if defined(USE_GIT_DESCRIBE )xf86DrvMsg (scrn->scrnIndex,X_INFO ,"SNA compiled from %s\n" , git_version); -#elif BUILDER_DESCRIPTION +#elif defined(BUILDER_DESCRIPTION )xf86DrvMsg (scrn->scrnIndex,X_INFO ,"SNA compiled: %s\n" ,BUILDER_DESCRIPTION );#endif Signature · 1 line
1.7.7.1
Both the bug and the fix are still valid. Can this be applied to master please?
Mraw,
KiBi.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Cyril Brulebois
If --with-builderstring="foo" is passed to configure (and sna enabled):
CC sna_driver.losrc/sna/sna_driver.c: In function 'sna_init_scrn':src/sna/sna_driver.c:1023:7: error: token ""foo"" is not valid in preprocessor expressionsFix the missing
defined()around theBUILDER_DESCRIPTIONvariable.
Apologies missed both the original and the ping, applied now. Many thanks,
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre