<div dir="ltr"><div>Acked-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div>Untested-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Feb 26, 2018 at 8:46 AM, Dylan Baker <<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">libgl will be undefined if with_glx == 'disabled', so move that check inside the `if with_glx == 'disabled'` block immediately after that check. Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd") Reported-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>> Signed-off-by: Dylan Baker <<a href="mailto:dylan.c.baker@intel.com">dylan.c.baker@intel.com</a>> CC: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>> CC: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>> --- src/meson.build | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/meson.build b/src/meson.build index b2c045fce10..19005271d73 100644 --- a/src/meson.build +++ b/src/meson.build @@ -82,18 +82,19 @@ if with_gallium subdir('gallium') endif -# If using glvnd the pkg-config header should not point to GL_mesa, it should -# point to GL. glvnd is only available on unix like platforms so adding -l -# should be safe here -# TODO: in the glvnd case glvnd itself should really be providing this. -if with_glvnd - _gl = '-L${libdir} -lGL' -else - _gl = libgl -endif # This must be after at least mesa, glx, and gallium, since libgl will be # defined in one of those subdirs depending on the glx provider. if with_glx != 'disabled' + # If using glvnd the pkg-config header should not point to GL_mesa, it should + # point to GL. glvnd is only available on unix like platforms so adding -l + # should be safe here + # TODO: in the glvnd case glvnd itself should really be providing this. + if with_glvnd + _gl = '-L${libdir} -lGL' + else + _gl = libgl + endif + pkg.generate( name : 'gl', description : 'Mesa OpenGL Library', -- 2.16.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>