Re: [PATCH] Fix build failure when passing --with-builderstring.

From: Cyril Brulebois <kibi@debian.org>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] Fix build failure when passing --with-builderstring.
Date: Sat, 31 Dec 2011 02:19:34 +0100	[thread overview]
Message-ID: <20111231011934.GC3158@mraw.org> (raw)
In-Reply-To: <1320704969-8530-1-git-send-email-kibi@debian.org>

[-- Attachment #1.1: Type: text/plain, Size: 1174 bytes --]

Cyril Brulebois <kibi@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@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.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx