fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glcpp/meson: fix libglcpp generated header dependency

Browse source 
Explicitly declare glcpp-parse.h as a file dependency to ensure
glcpp_parse custom target completes before compiling glcpp-lex.c.

Cc: mesa-stable
(cherry picked from commit 53482178ef)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38432>
This commit is contained in:
Yiwei Zhang 2025-11-04 23:54:12 -08:00 • committed by Dylan Baker
parent ec8518d123
commit c167b0a816
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1304,7 +1304,7 @@
"description": "glcpp/meson: fix libglcpp generated header dependency",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

8
src/compiler/glsl/glcpp/meson.build
View file

@ -28,10 +28,16 @@ glcpp_lex = custom_target(
command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
)
glcpp_header_gen_deps = declare_dependency(
sources : [
glcpp_parse[1],
],
)
libglcpp = static_library(
'glcpp',
[glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
dependencies : idep_mesautil,
dependencies : [idep_mesautil, glcpp_header_gen_deps],
include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [no_override_init_args, c_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],