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/mesa | |
| 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/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/meson.build | 2 | ||||
| -rw-r--r-- | src/mesa/main/meson.build | 6 | ||||
| -rw-r--r-- | src/mesa/meson.build | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index 761bb51d6fa..6c94f4aea71 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -170,7 +170,7 @@ i965_oa_sources = custom_target( input : i965_hw_metrics_xml_files, output : [ 'brw_oa_metrics.c', 'brw_oa_metrics.h' ], command : [ - prog_python2, files('brw_oa.py'), + prog_python, files('brw_oa.py'), '--code', '@OUTPUT0@', '--header', '@OUTPUT1@', '@INPUT@', ], diff --git a/src/mesa/main/meson.build b/src/mesa/main/meson.build index 57487fe4da5..a5f0e02c6cd 100644 --- a/src/mesa/main/meson.build +++ b/src/mesa/main/meson.build @@ -22,7 +22,7 @@ main_dispatch_h = custom_target( 'dispatch.h', input : [files('../../mapi/glapi/gen/gl_table.py'), gl_and_es_api_files], output : 'dispatch.h', - command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@', '-m', 'remap_table'], + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '-m', 'remap_table'], depend_files : glapi_gen_depends, capture : true, ) @@ -31,7 +31,7 @@ main_marshal_generated_h = custom_target( 'marshal_generated.h', input : [files('../../mapi/glapi/gen/gl_marshal_h.py'), gl_and_es_api_files], output : 'marshal_generated.h', - command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], depend_files : files('../../mapi/glapi/gen/marshal_XML.py') + glapi_gen_depends, capture : true, ) @@ -40,7 +40,7 @@ main_remap_helper_h = custom_target( 'remap_helper.h', input : [files('../../mapi/glapi/gen/remap_helper.py'), gl_and_es_api_files], output : 'remap_helper.h', - command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], depend_files : glapi_gen_depends, capture : true, ) diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 29633691ee7..10ae63b611b 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -664,7 +664,7 @@ format_fallback_c = custom_target( 'format_fallback.c', input : ['main/format_fallback.py', 'main/formats.csv'], output : 'format_fallback.c', - command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], depend_files : files('main/format_parser.py'), ) @@ -672,7 +672,7 @@ get_hash_h = custom_target( 'get_hash.h', input : ['main/get_hash_generator.py', gl_and_es_api_files], output : 'get_hash.h', - command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], depend_files : files('main/get_hash_params.py'), capture : true, ) @@ -684,7 +684,7 @@ foreach x : [['format_info.h', 'format_info.py'], x[0], input : ['main/@0@'.format(x[1]), 'main/formats.csv'], output : x[0], - command : [prog_python2, '@INPUT0@', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '@INPUT1@'], depend_files : files('main/format_parser.py'), capture : true, ) |