[Mesa-dev] [PATCH] egl/main: remove undefined X11_LIBS automake variable

Kenneth Graunke kenneth at whitecape.org
Mon Oct 7 14:28:07 PDT 2013


On 10/01/2013 02:07 PM, Kenneth Graunke wrote:
> On 10/01/2013 06:31 AM, Gaetan Nadon wrote:
>> On 13-09-28 04:23 PM, Emil Velikov wrote:
>>> On 28/09/13 20:00, Gaetan Nadon wrote:
>>>> The EGL library has some references to x11 but it gets the link flags
>>>> from the XCB_DRI2_LIBS iff HAVE_EGL_PLATFORM_X11 is true.
>>> s/iff/if/
>>>> The X11_LIBS variable was probably coming from a PKG_CHECK_MODULES (x11)
>>>> earlier in history.
>>>>
>>>> If it is possible to have HAVE_EGL_DRIVER_GLX without HAVE_EGL_PLATFORM_X11
>>>> then the link flags for libX11 should be passed. However, it won't come
>>>> from X11_LIBS which is undefined.
>>>>
>>>> Reported-by: Emil Velicov <emil.l.velikov at gmail.com>
>>> s/Velicov/Velikov/
>> Sorry for typo in your name.
>>>
>>> FWIW Acked-by: Emil Velikov <emil.l.velikov at gmail.com>
>>>
>>> Thanks :)
>>> Emil (Yet another person having fun with the build system)
>>>
>>>> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
>>>> ---
>>>>  src/egl/main/Makefile.am |    2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
>>>> index 2e43860..5e59a08 100644
>>>> --- a/src/egl/main/Makefile.am
>>>> +++ b/src/egl/main/Makefile.am
>>>> @@ -105,7 +105,7 @@ endif
>>>>  if HAVE_EGL_DRIVER_GLX
>>>>  AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
>>>>  libEGL_la_LIBADD += ../drivers/glx/libegl_glx.la
>>>> -libEGL_la_LIBADD += $(X11_LIBS) $(DLOPEN_LIBS)
>>>> +libEGL_la_LIBADD += $(DLOPEN_LIBS)
>>>>  endif
>>>>  
>>>>  if HAVE_EGL_DRIVER_DRI2
>>
>> What's the process to get the four patches pushed to git?
> 
> FWIW, I'm in favor of giving Gaetan push access.  He's done a ton of
> great work on the build systems across all the X projects, and it makes
> sense to just let him push patches like these.
> 
> Alex also agreed on IRC.  Could someone add gnadon to the mesa group?

Gaetan,

Carl just added you to the mesa group, so you should have push access now.

Basically the process is:
1. Send patches to the list for review.
2. Wait at least 24 hours.
3. Once someone has reviewed them, go ahead and push them.

Thanks again!
--Ken


More information about the mesa-dev mailing list