From e0adef2652ba90c06be637a48cffc48d76888812 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 17 Jan 2023 17:57:43 +0000
Subject: [PATCH] meson: only build libglsl_util when needed

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19600>
---
 src/compiler/glsl/meson.build | 9 +++++++++
 src/meson.build               | 9 +--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index b49fb953fae..4cf4f6d5c86 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -18,6 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+libglsl_util = static_library(
+  'glsl_util',
+  glsl_util_files,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  dependencies : dep_valgrind,
+  gnu_symbol_visibility : 'hidden',
+  build_by_default : false,
+)
+
 subdir('glcpp')
 
 bison_command = []
diff --git a/src/meson.build b/src/meson.build
index 075c38751d7..34fc333df60 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -36,18 +36,11 @@ else
   inc_amd_common_llvm = []
 endif
 
-libglsl_util = static_library(
-  'glsl_util',
-  files(
+glsl_util_files = files(
     'mesa/main/extensions_table.c',
     'mesa/program/prog_parameter.c',
     'mesa/program/symbol_table.c',
     'mesa/program/dummy_errors.c',
-  ),
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-  dependencies : dep_valgrind,
-  gnu_symbol_visibility : 'hidden',
-  build_by_default : false,
 )
 
 sha1_h = custom_target(