meson: re-add incorrect pkg-config files with GLVND for backward compatibility

[mesa.git] / src / meson.build

diff --git a/src/meson.build b/src/meson.build
index 11e0011c057426edec4711d3087b40b93f8c86e7..ddbcd7f3ae42819cae40caaa1146589f4ff30d57 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -111,12 +111,22 @@ 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' and not with_glvnd
+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 and glvnd_missing_pc_files
+    _gl = '-L${libdir} -lGL'
+  else
+    _gl = libgl
+  endif
+
   pkg.generate(
     name : 'gl',
     description : 'Mesa OpenGL Library',
     version : meson.project_version(),
-    libraries : libgl,
+    libraries : _gl,
     libraries_private : gl_priv_libs,
     requires_private : gl_priv_reqs,
     variables : ['glx_tls=yes'],