diff options
| author | Mathieu Bridon <[email protected]> | 2018-08-09 10:27:26 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-08-10 15:15:09 -0700 |
| commit | 2ee1c86d71bee5ddca2c8795b4d343e31d28df99 (patch) | |
| tree | 434ff307fe52734f62ae83427accc863cb455778 /src/gallium/drivers/swr | |
| parent | bd27203f4d808763ac24ac94eb677cacf3e7cb99 (diff) | |
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 <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/codegen/meson.build b/src/gallium/drivers/swr/rasterizer/codegen/meson.build index 841540e0f30..28275176022 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/meson.build +++ b/src/gallium/drivers/swr/rasterizer/codegen/meson.build @@ -22,7 +22,7 @@ gen_knobs_cpp = custom_target( 'gen_knobs.cpp', input : ['gen_knobs.py'], output : 'gen_knobs.cpp', - command : [prog_python2, '@INPUT0@', '--output', '@OUTPUT@', '--gen_cpp'], + command : [prog_python, '@INPUT0@', '--output', '@OUTPUT@', '--gen_cpp'], depend_files : files( 'knob_defs.py', 'gen_common.py', 'templates/gen_knobs.cpp', @@ -33,7 +33,7 @@ gen_knobs_h = custom_target( 'gen_knobs.h', input : ['gen_knobs.py'], output : 'gen_knobs.h', - command : [prog_python2, '@INPUT0@', '--output', '@OUTPUT@', '--gen_h'], + command : [prog_python, '@INPUT0@', '--output', '@OUTPUT@', '--gen_h'], depend_files : files( 'knob_defs.py', 'gen_common.py', 'templates/gen_knobs.h', @@ -53,7 +53,7 @@ foreach x : [[swr_context_files, 'gen_swr_context_llvm.h'], x[1], input : ['gen_llvm_types.py', x[0]], output : x[1], - command : [prog_python2, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@'], depend_files : files( 'templates/gen_llvm.hpp', 'gen_common.py', @@ -70,7 +70,7 @@ foreach x : [['gen_ar_event.hpp', '--gen_event_hpp'], input : ['gen_archrast.py', swr_event_proto_files, swr_event_pproto_files], output : x[0], command : [ - prog_python2, + prog_python, '@INPUT0@', '--proto', '@INPUT1@', '--proto_private', '@INPUT2@', diff --git a/src/gallium/drivers/swr/rasterizer/core/backends/meson.build b/src/gallium/drivers/swr/rasterizer/core/backends/meson.build index 80b62174a6b..d64715dc8be 100644 --- a/src/gallium/drivers/swr/rasterizer/core/backends/meson.build +++ b/src/gallium/drivers/swr/rasterizer/core/backends/meson.build @@ -28,7 +28,7 @@ files_swr_common += custom_target( 'gen_BackendPixelRate.hpp', ], command : [ - prog_python2, '@INPUT@', + prog_python, '@INPUT@', '--outdir', '@OUTDIR@', '--dim', '5', '2', '3', '2', '2', '2', '--numfiles', '4', @@ -46,7 +46,7 @@ files_swr_common += custom_target( 'gen_rasterizer.hpp', ], command : [ - prog_python2, '@INPUT@', + prog_python, '@INPUT@', '--outdir', '@OUTDIR@', '--rast', '--dim', '5', '2', '2', '3', '5', '2', diff --git a/src/gallium/drivers/swr/rasterizer/jitter/meson.build b/src/gallium/drivers/swr/rasterizer/jitter/meson.build index 5c201990b50..aced4a1b735 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/meson.build +++ b/src/gallium/drivers/swr/rasterizer/jitter/meson.build @@ -30,7 +30,7 @@ gen_builder_hpp = custom_target( ], output : 'gen_builder.hpp', command : [ - prog_python2, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@', '--gen_h', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, @@ -42,7 +42,7 @@ gen_builder_meta_hpp = custom_target( input : '../codegen/gen_llvm_ir_macros.py', output : 'gen_builder_meta.hpp', command : [ - prog_python2, '@INPUT0@', '--gen_meta_h', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--gen_meta_h', '--output', '@OUTPUT@', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, @@ -53,7 +53,7 @@ gen_builder_intrin_hpp = custom_target( input : '../codegen/gen_llvm_ir_macros.py', output : 'gen_builder_intrin.hpp', command : [ - prog_python2, '@INPUT0@', '--gen_intrin_h', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--gen_intrin_h', '--output', '@OUTPUT@', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, |