From 2ee1c86d71bee5ddca2c8795b4d343e31d28df99 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Thu, 9 Aug 2018 10:27:26 +0200 Subject: meson: Build with Python 3 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 Reviewed-by: Eric Engestrom Reviewed-by: Dylan Baker --- src/compiler/glsl/meson.build | 4 ++-- src/compiler/meson.build | 2 +- src/compiler/nir/meson.build | 14 +++++++------- src/compiler/spirv/meson.build | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index df1c086671d..7e4dd2929a3 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -41,7 +41,7 @@ ir_expression_operation_constant_h = custom_target( 'ir_expression_operation_constant.h', input : 'ir_expression_operation.py', output : 'ir_expression_operation_constant.h', - command : [prog_python2, '@INPUT@', 'constant'], + command : [prog_python, '@INPUT@', 'constant'], capture : true, ) @@ -49,7 +49,7 @@ ir_expression_operation_strings_h = custom_target( 'ir_expression_operation_strings.h', input : 'ir_expression_operation.py', output : 'ir_expression_operation_strings.h', - command : [prog_python2, '@INPUT@', 'strings'], + command : [prog_python, '@INPUT@', 'strings'], capture : true, ) diff --git a/src/compiler/meson.build b/src/compiler/meson.build index 60b633832d4..0f8f3c12966 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -40,7 +40,7 @@ ir_expression_operation_h = custom_target( 'ir_expression_operation.h', input : 'glsl/ir_expression_operation.py', output : 'ir_expression_operation.h', - command : [prog_python2, '@INPUT@', 'enum'], + command : [prog_python, '@INPUT@', 'enum'], capture : true, ) diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 010da386ce3..8708f9b069c 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -24,7 +24,7 @@ nir_builder_opcodes_h = custom_target( 'nir_builder_opcodes.h', input : 'nir_builder_opcodes_h.py', output : 'nir_builder_opcodes.h', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, depend_files : nir_depends, ) @@ -33,7 +33,7 @@ nir_constant_expressions_c = custom_target( 'nir_constant_expressions.c', input : 'nir_constant_expressions.py', output : 'nir_constant_expressions.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, depend_files : nir_depends, ) @@ -42,7 +42,7 @@ nir_opcodes_h = custom_target( 'nir_opcodes.h', input : 'nir_opcodes_h.py', output : 'nir_opcodes.h', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, depend_files : nir_depends, ) @@ -51,7 +51,7 @@ nir_opcodes_c = custom_target( 'nir_opcodes.c', input : 'nir_opcodes_c.py', output : 'nir_opcodes.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, depend_files : nir_depends, ) @@ -60,7 +60,7 @@ nir_opt_algebraic_c = custom_target( 'nir_opt_algebraic.c', input : 'nir_opt_algebraic.py', output : 'nir_opt_algebraic.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, depend_files : files('nir_algebraic.py'), ) @@ -69,7 +69,7 @@ nir_intrinsics_h = custom_target( 'nir_intrinsics.h', input : 'nir_intrinsics_h.py', output : 'nir_intrinsics.h', - command : [prog_python2, '@INPUT@', '--outdir', meson.current_build_dir()], + command : [prog_python, '@INPUT@', '--outdir', meson.current_build_dir()], capture : false, depend_files : files('nir_intrinsics.py'), ) @@ -78,7 +78,7 @@ nir_intrinsics_c = custom_target( 'nir_intrinsic.c', input : 'nir_intrinsics_c.py', output : 'nir_intrinsics.c', - command : [prog_python2, '@INPUT@', '--outdir', meson.current_build_dir()], + command : [prog_python, '@INPUT@', '--outdir', meson.current_build_dir()], capture: false, depend_files : files('nir_intrinsics.py'), ) diff --git a/src/compiler/spirv/meson.build b/src/compiler/spirv/meson.build index eb0c0d554d9..c91d12a27d9 100644 --- a/src/compiler/spirv/meson.build +++ b/src/compiler/spirv/meson.build @@ -22,12 +22,12 @@ vtn_gather_types_c = custom_target( 'vtn_gather_types.c', input : files('vtn_gather_types_c.py', 'spirv.core.grammar.json'), output : 'vtn_gather_types.c', - command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], ) spirv_info_c = custom_target( 'spirv_info.c', input : files('spirv_info_c.py', 'spirv.core.grammar.json'), output : 'spirv_info.c', - command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], ) -- cgit v1.2.3