From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Brulebois Subject: Re: [PATCH] Fix build failure when passing --with-builderstring. Date: Sat, 31 Dec 2011 02:19:34 +0100 Message-ID: <20111231011934.GC3158@mraw.org> References: <1320704969-8530-1-git-send-email-kibi@debian.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0195104607==" Return-path: Received: from glenfiddich.mraw.org (glenfiddich.mraw.org [88.191.124.82]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E7AD9E79F for ; Fri, 30 Dec 2011 18:01:09 -0800 (PST) Received: from [2a01:e35:2ec8:9d70:21e:64ff:fe0e:9a16] (helo=bowmore.home.mraw.org) by glenfiddich.mraw.org with esmtp (Exim 4.72) (envelope-from ) id 1RgnbV-000341-7x for intel-gfx@lists.freedesktop.org; Sat, 31 Dec 2011 02:19:21 +0100 Received: from kibi by bowmore.home.mraw.org with local (Exim 4.77) (envelope-from ) id 1Rgnbi-0002kI-SC for intel-gfx@lists.freedesktop.org; Sat, 31 Dec 2011 02:19:34 +0100 In-Reply-To: <1320704969-8530-1-git-send-email-kibi@debian.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0195104607== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NU0Ex4SbNnrxsi6C" Content-Disposition: inline --NU0Ex4SbNnrxsi6C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Cyril Brulebois (07/11/2011): > If --with-builderstring=3D"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 preproc= essor expressions >=20 > Fix the missing defined() around the BUILDER_DESCRIPTION variable. >=20 > Signed-off-by: Cyril Brulebois > --- > src/sna/sna_driver.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) >=20 > 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 > --=20 > 1.7.7.1 Both the bug and the fix are still valid. Can this be applied to master please? Mraw, KiBi. --NU0Ex4SbNnrxsi6C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk7+YyYACgkQeGfVPHR5Nd2CSQCgpelh/5hNfXG2Bg7elRG4FCNf f8oAoIqwFAD41qRz7OtekuPbIRY6nBOq =e9aN -----END PGP SIGNATURE----- --NU0Ex4SbNnrxsi6C-- --===============0195104607== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0195104607==--