[Mesa-dev] [PATCH] Export TLS support in gl.pc.

[Brian Paul]

Hi Tom,

I think you can assume silence = consent with things like this.
As far as I'm concerned you can go ahead and commit the change.

-Brian


On 01/09/2011 03:32 PM, tom fogal wrote:
> Ping!
>
> No NAKs in ~5 days and one explicit request (on xorg-devel):
>
>     http://permalink.gmane.org/gmane.comp.freedesktop.xorg.devel/17570
>
> Okay for master, and (after settling) 7.10?
>
> -tom
>
> tfogal at sci.utah.edu wrote:
>> From: Tom Fogal<tfogal at alumni.unh.edu>
>>
>> If nothing else, this would be useful for debugging TLS mismatches
>> ("can you tell me if glx_tls is 'yes' in your gl.pc?").
>> ---
>>   configs/autoconf.in |    1 +
>>   configure.ac        |    8 +++++++-
>>   src/mesa/Makefile   |    1 +
>>   src/mesa/gl.pc.in   |    1 +
>>   4 files changed, 10 insertions(+), 1 deletions(-)
>>
>> diff --git a/configs/autoconf.in b/configs/autoconf.in
>> index e2d70c6..a3b6c82 100644
>> --- a/configs/autoconf.in
>> +++ b/configs/autoconf.in
>> @@ -33,6 +33,7 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@
>>   LLVM_LIBS = @LLVM_LIBS@
>>   GLW_CFLAGS = @GLW_CFLAGS@
>>   GLUT_CFLAGS = @GLUT_CFLAGS@
>> +GLX_TLS = @GLX_TLS@
>>
>>   TALLOC_LIBS = @TALLOC_LIBS@
>>   TALLOC_CFLAGS = @TALLOC_CFLAGS@
>> diff --git a/configure.ac b/configure.ac
>> index bd06f8e..24c5406 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -811,13 +811,19 @@ if test "$mesa_driver" = xlib; then
>>   fi
>>
>>   dnl
>> -dnl More DRI setup
>> +dnl TLS detection
>>   dnl
>> +
>>   AC_ARG_ENABLE([glx-tls],
>>       [AS_HELP_STRING([--enable-glx-tls],
>>           [enable TLS support in GLX @<:@default=disabled@:>@])],
>>       [GLX_USE_TLS="$enableval"],
>>       [GLX_USE_TLS=no])
>> +AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
>> +
>> +dnl
>> +dnl More DRI setup
>> +dnl
>>   dnl Directory for DRI drivers
>>   AC_ARG_WITH([dri-driverdir],
>>       [AS_HELP_STRING([--with-dri-driverdir=DIR],
>> diff --git a/src/mesa/Makefile b/src/mesa/Makefile
>> index 8b0756b..2607df1 100644
>> --- a/src/mesa/Makefile
>> +++ b/src/mesa/Makefile
>> @@ -192,6 +192,7 @@ gl_pcedit = sed \
>>   	-e 's, at GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
>>   	-e 's, at GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
>>   	-e 's, at GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
>> +	-e 's, at GLX_TLS@,$(GLX_TLS),' \
>>   	-e 's, at GL_LIB@,$(GL_LIB),'
>>
>>   gl.pc: gl.pc.in
>> diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
>> index 97b8659..2d3bc91 100644
>> --- a/src/mesa/gl.pc.in
>> +++ b/src/mesa/gl.pc.in
>> @@ -10,3 +10,4 @@ Version: @VERSION@
>>   Libs: -L${libdir} -l at GL_LIB@
>>   Libs.private: @GL_PC_LIB_PRIV@
>>   Cflags: -I${includedir} @GL_PC_CFLAGS@
>> +glx_tls: @GLX_TLS@
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> .
>