Mesa (master): meson: add missing dependency on generated git_sha1.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Dec 17 00:17:23 UTC 2020


Module: Mesa
Branch: master
Commit: 434da21a7c81acbe03f0e1621e80904313c0b05c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=434da21a7c81acbe03f0e1621e80904313c0b05c

Author: Michael Forney <mforney at mforney.org>
Date:   Wed Dec 16 00:48:25 2020 -0800

meson: add missing dependency on generated git_sha1.h

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8121>

---

 src/freedreno/common/meson.build           | 1 +
 src/gallium/frontends/lavapipe/meson.build | 2 +-
 src/intel/common/meson.build               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/common/meson.build b/src/freedreno/common/meson.build
index 2da6c1eacf8..30ef23043a7 100644
--- a/src/freedreno/common/meson.build
+++ b/src/freedreno/common/meson.build
@@ -27,6 +27,7 @@ libfreedreno_common = static_library(
     'freedreno_uuid.c',
     'freedreno_uuid.h',
     'freedreno_guardband.h',
+    sha1_h,
   ],
   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
   c_args : [no_override_init_args],
diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build
index 972735fcff9..94c68d14d23 100644
--- a/src/gallium/frontends/lavapipe/meson.build
+++ b/src/gallium/frontends/lavapipe/meson.build
@@ -57,7 +57,7 @@ endif
 
 liblavapipe_st = static_library(
   'lavapipe_st',
-  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
   link_with : [ libvulkan_wsi ],
   c_args : [ lvp_flags ],
   gnu_symbol_visibility : 'hidden',
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 2586b4cf956..53c458f447d 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -42,8 +42,8 @@ files_libintel_common = files(
 )
 
 libintel_common = static_library(
-  ['intel_common', genX_xml_h],
-  files_libintel_common,
+  'intel_common',
+  [files_libintel_common, genX_xml_h, sha1_h],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',



More information about the mesa-commit mailing list