[Intel-gfx] [PATCH] Fix build failure when passing --with-builderstring.

Cyril Brulebois kibi at debian.org
Sat Dec 31 02:19:34 CET 2011


Cyril Brulebois <kibi at debian.org> (07/11/2011):
> If --with-builderstring="foo" is passed to configure (and sna enabled):
>   CC     sna_driver.lo
> src/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.
> 
> Signed-off-by: Cyril Brulebois <kibi at debian.org>
> ---
>  src/sna/sna_driver.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
> index 83abdb3..767cd2c 100644
> --- a/src/sna/sna_driver.c
> +++ b/src/sna/sna_driver.c
> @@ -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
> -- 
> 1.7.7.1

Both the bug and the fix are still valid. Can this be applied to master
please?

Mraw,
KiBi.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20111231/eade4d1a/attachment.sig>


More information about the Intel-gfx mailing list