Mesa (staging/20.0): vulkan-overlay/meson: use install_data instead of configure_file

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 765a7d320775e268da2b58802126e43fcbdbc964
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=765a7d320775e268da2b58802126e43fcbdbc964

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Wed May 20 18:00:14 2020 -0700

vulkan-overlay/meson: use install_data instead of configure_file

We don't want to copy the file into the build directory, we want to
install it. That's what install_data is for.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2924
Fixes: 56ccea58ae7f6fd56cf4a1697d2cceb68866b552
       ("vulkan/overlay: Add basic overlay control script.")

Acked-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>
(cherry picked from commit fb62e642ae667c99aeb3015fa77ab668af5e4ee6)

---

 .pick_status.json                    | 2 +-
 src/vulkan/overlay-layer/meson.build | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 43936aba4dd..92468732cfb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2290,7 +2290,7 @@
         "description": "vulkan-overlay/meson: use install_data instead of configure_file",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "56ccea58ae7f6fd56cf4a1697d2cceb68866b552"
     },
diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
index 5b553d0b51e..5f922404802 100644
--- a/src/vulkan/overlay-layer/meson.build
+++ b/src/vulkan/overlay-layer/meson.build
@@ -52,9 +52,8 @@ install_data(
   install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
 )
 
-configure_file(
-  input : files('mesa-overlay-control.py'),
-  output : '@PLAINNAME@',
-  configuration : configuration_data(), # only copy the file
-  install_dir: get_option('bindir'),
+install_data(
+  'mesa-overlay-control.py',
+  install_dir : get_option('bindir'),
+  install_mode : 'r-xr-xr-x',
 )