From ccb8ea7acfb710c6c5298f3ffcadbe3d79b9b913 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 2 May 2019 12:42:48 +0100 Subject: [PATCH] meson: expose glapi through osmesa Suggested-by: Pierre Guillou Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109659 Fixes: f121a669c7d94d2ff672 "meson: build gallium based osmesa" Fixes: cbbd5bb889a2c271a504 "meson: build classic osmesa" Cc: Brian Paul Cc: Dylan Baker Signed-off-by: Eric Engestrom Tested-by: Chuck Atkins --- src/gallium/targets/osmesa/meson.build | 4 ++-- src/mesa/drivers/osmesa/meson.build | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index b4ae8f4b6ec..e873e311aa0 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -43,9 +43,9 @@ libosmesa = shared_library( inc_gallium_drivers, ], link_depends : osmesa_link_deps, - link_whole : [libosmesa_st], + link_whole : [libosmesa_st, libglapi_static], link_with : [ - libmesa_gallium, libgallium, libglapi_static, libws_null, osmesa_link_with, + libmesa_gallium, libgallium, libws_null, osmesa_link_with, ], dependencies : [ dep_selinux, dep_thread, dep_clock, dep_unwind, diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build index a406bb3c210..c479b740131 100644 --- a/src/mesa/drivers/osmesa/meson.build +++ b/src/mesa/drivers/osmesa/meson.build @@ -33,7 +33,8 @@ libosmesa = shared_library( include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, ], - link_with : [libmesa_classic, libglapi_static, osmesa_link_with], + link_whole : libglapi_static, + link_with : [libmesa_classic, osmesa_link_with], dependencies : [dep_thread, dep_selinux], version : '8.0.0', install : true, -- 2.30.2