diff options
| author | Eric Engestrom <[email protected]> | 2019-09-18 21:48:49 +0100 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-23 11:11:59 -0700 |
| commit | 0c29a15a0975b0b685dc24000e468288eac25c92 (patch) | |
| tree | 3f4c3bd305ab5c656f0c3abfb41988fa8963f056 | |
| parent | 401de43891b83376ca9db4986ce262be1057a121 (diff) | |
gl: drop incorrect pkg-config file for glvnd
Akin to 1a25980c469b38d2c645 ("egl: drop incorrect pkg-config file for
glvnd") and b01524fff05eef66e8cd ("meson: don't build libGLES*.so with
GLVND") , removes a pkg-config file that shouldn't have been there in
the first place, but was needed because of that GLVND bug.
Now that the glvnd bug has been fixed, it was apparent that this gl.pc
pkg-config file was forgotten to be removed, so let's do just that :)
Suggested-by: Matt Turner <[email protected]>
Cc: [email protected]
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
(cherry picked from commit a1de3011f380b6ffd5583708b58e3f86d8d45ea9)
| -rw-r--r-- | src/meson.build | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/meson.build b/src/meson.build index d86c0ec21a6..69ad05ea03b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -106,22 +106,12 @@ 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 - +if with_glx != 'disabled' and not with_glvnd pkg.generate( name : 'gl', description : 'Mesa OpenGL Library', version : meson.project_version(), - libraries : _gl, + libraries : libgl, libraries_private : gl_priv_libs, requires_private : gl_priv_reqs, variables : ['glx_tls=yes'], |