meson: Run the install script with Python 3
authorMathieu Bridon <bochecha@daitauha.fr>
Wed, 22 Aug 2018 12:09:49 +0000 (14:09 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 23 Aug 2018 11:12:06 +0000 (12:12 +0100)
The script was being run directly as an executable, and it has a
Python 2 shebang.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/gallium/targets/dri/meson.build
src/gallium/targets/va/meson.build
src/gallium/targets/vdpau/meson.build
src/gallium/targets/xvmc/meson.build
src/mesa/drivers/dri/meson.build

index e3202c9..51940a2 100644 (file)
@@ -84,6 +84,7 @@ foreach d : [[with_gallium_pl111, 'pl111_dri.so'],
 endforeach
 
 meson.add_install_script(
+  prog_python.path(),
   join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
   libgallium_dri.full_path(),
   dri_drivers_path,
index 57d267e..ded689b 100644 (file)
@@ -62,6 +62,7 @@ foreach d : [[with_gallium_r600, 'r600'],
 endforeach
 
 meson.add_install_script(
+  prog_python.path(),
   join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
   libva_gallium.full_path(),
   va_drivers_path,
index 93969d8..005cf64 100644 (file)
@@ -65,6 +65,7 @@ foreach d : [[with_gallium_r300, 'r300'],
 endforeach
 
 meson.add_install_script(
+  prog_python.path(),
   join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
   libvdpau_gallium.full_path(),
   vdpau_drivers_path,
index 2bf5ea2..0af5b64 100644 (file)
@@ -56,6 +56,7 @@ foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']]
 endforeach
 
 meson.add_install_script(
+  prog_python.path(),
   join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
   libxvmc_gallium.full_path(),
   xvmc_drivers_path,
index 943727b..d98c823 100644 (file)
@@ -57,6 +57,7 @@ if dri_drivers != []
   )
 
   meson.add_install_script(
+    prog_python.path(),
     join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
     libmesa_dri_drivers.full_path(),
     dri_drivers_path,