AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Build with Python 3

Browse Source 
Now that all the build scripts are compatible with both Python 2 and 3,
we can flip the switch and tell Meson to use the latter.

Since Meson already depends on Python 3 anyway, this means we don't need
two different Python stacks to build Mesa.

Signed-off-by: Mathieu Bridon <bochecha@daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Mathieu Bridon
2018-08-09 10:27:26 +02:00
committed by Dylan Baker
parent bd27203f4d
commit 2ee1c86d71
31 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/compiler/meson.build
+1 -1
View File
@@ -122,7 +122,7 @@ brw_nir_trig = custom_target(
input : 'brw_nir_trig_workarounds.py',
output : 'brw_nir_trig_workarounds.c',
command : [
prog_python2, '@INPUT@',
prog_python, '@INPUT@',
'-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
],
depend_files : nir_algebraic_py,
src/intel/genxml/meson.build
+3 -3
View File
@@ -35,7 +35,7 @@ genX_xml_h = custom_target(
'genX_xml.h',
input : ['gen_zipped_file.py', gen_xml_files],
output : 'genX_xml.h',
command : [prog_python2, '@INPUT@'],
command : [prog_python, '@INPUT@'],
capture : true,
)
@@ -43,7 +43,7 @@ genX_bits_h = custom_target(
'genX_bits.h',
input : ['gen_bits_header.py', gen_xml_files],
output : 'genX_bits.h',
command : [prog_python2, '@INPUT@', '-o', '@OUTPUT@'],
command : [prog_python, '@INPUT@', '-o', '@OUTPUT@'],
)
gen_xml_pack = []
@@ -53,7 +53,7 @@ foreach f : gen_xml_files
_name,
input : ['gen_pack_header.py', f],
output : _name,
command : [prog_python2, '@INPUT@'],
command : [prog_python, '@INPUT@'],
capture : true,
)
endforeach
src/intel/isl/meson.build
+1 -1
View File
@@ -66,7 +66,7 @@ isl_format_layout_c = custom_target(
'isl_format_layout.c',
input : ['gen_format_layout.py', 'isl_format_layout.csv'],
output : 'isl_format_layout.c',
command : [prog_python2, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
command : [prog_python, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
)
libisl_files = files(
src/intel/vulkan/meson.build
+5 -5
View File
@@ -25,7 +25,7 @@ anv_entrypoints = custom_target(
input : ['anv_entrypoints_gen.py', vk_api_xml],
output : ['anv_entrypoints.h', 'anv_entrypoints.c'],
command : [
prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
prog_python, '@INPUT0@', '--xml', '@INPUT1@',
'--outdir', meson.current_build_dir(),
],
depend_files : anv_extensions_py,
@@ -36,7 +36,7 @@ anv_extensions_c = custom_target(
input : ['anv_extensions_gen.py', vk_api_xml],
output : 'anv_extensions.c',
command : [
prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
prog_python, '@INPUT0@', '--xml', '@INPUT1@',
'--out-c', '@OUTPUT@',
],
depend_files : anv_extensions_py,
@@ -47,7 +47,7 @@ anv_extensions_h = custom_target(
input : ['anv_extensions_gen.py', vk_api_xml],
output : 'anv_extensions.h',
command : [
prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
prog_python, '@INPUT0@', '--xml', '@INPUT1@',
'--out-h', '@OUTPUT@',
],
depend_files : anv_extensions_py,
@@ -58,7 +58,7 @@ intel_icd = custom_target(
input : 'anv_icd.py',
output : 'intel_icd.@0@.json'.format(host_machine.cpu()),
command : [
prog_python2, '@INPUT@',
prog_python, '@INPUT@',
'--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
'--out', '@OUTPUT@',
],
@@ -73,7 +73,7 @@ dev_icd = custom_target(
input : 'anv_icd.py',
output : 'dev_icd.@0@.json'.format(host_machine.cpu()),
command : [
prog_python2, '@INPUT@', '--lib-path', meson.current_build_dir(),
prog_python, '@INPUT@', '--lib-path', meson.current_build_dir(),
'--out', '@OUTPUT@'
],
depend_files : files('anv_extensions.py'),