subject:"\[Mesa\-dev\] \[PATCH 26\/26\] meson\: Build with Python 3"

[Mesa-dev] [PATCH 26/26] meson: Build with Python 3

2018-07-05 Thread Mathieu Bridon

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 
---
 meson.build   |  6 ++---
 src/amd/common/meson.build|  2 +-
 src/amd/vulkan/meson.build| 10 +++
 src/broadcom/cle/meson.build  |  4 +--
 src/compiler/glsl/meson.build |  4 +--
 src/compiler/meson.build  |  2 +-
 src/compiler/nir/meson.build  | 14 +-
 src/compiler/spirv/meson.build|  4 +--
 src/egl/meson.build   |  4 +--
 src/gallium/auxiliary/meson.build |  6 ++---
 src/gallium/drivers/freedreno/meson.build |  2 +-
 src/gallium/drivers/r600/meson.build  |  2 +-
 src/gallium/drivers/radeonsi/meson.build  |  2 +-
 .../swr/rasterizer/codegen/meson.build|  8 +++---
 .../swr/rasterizer/core/backends/meson.build  |  4 +--
 .../drivers/swr/rasterizer/jitter/meson.build |  6 ++---
 src/intel/compiler/meson.build|  2 +-
 src/intel/genxml/meson.build  |  6 ++---
 src/intel/isl/meson.build |  2 +-
 src/intel/vulkan/meson.build  | 10 +++
 src/mapi/es1api/meson.build   |  2 +-
 src/mapi/es2api/meson.build   |  2 +-
 src/mapi/glapi/gen/meson.build| 26 +--
 src/mapi/shared-glapi/meson.build |  2 +-
 src/mesa/drivers/dri/i965/meson.build |  2 +-
 src/mesa/main/meson.build |  6 ++---
 src/mesa/meson.build  |  6 ++---
 src/meson.build   |  2 +-
 src/util/meson.build  |  2 +-
 src/util/xmlpool/meson.build  |  2 +-
 src/vulkan/util/meson.build   |  2 +-
 31 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/meson.build b/meson.build
index b2722c71e5..1b41373793 100644
--- a/meson.build
+++ b/meson.build
@@ -693,10 +693,10 @@ if with_platform_haiku
   pre_args += '-DHAVE_HAIKU_PLATFORM'
 endif
 
-prog_python2 = find_program('python2')
-has_mako = run_command(prog_python2, '-c', 'import mako')
+prog_python = find_program('python3')
+has_mako = run_command(prog_python, '-c', 'import mako')
 if has_mako.returncode() != 0
-  error('Python (2.x) mako module required to build mesa.')
+  error('Python (3.x) mako module required to build mesa.')
 endif
 
 if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6')
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index 0967b1adb7..6827a02094 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -22,7 +22,7 @@ sid_tables_h = custom_target(
   'sid_tables_h',
   input : ['sid_tables.py', 'sid.h', 'gfx9d.h'],
   output : 'sid_tables.h',
-  command : [prog_python2, '@INPUT@'],
+  command : [prog_python, '@INPUT@'],
   capture : true,
 )
 
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 22857926fa..c5c9b308c6 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -23,7 +23,7 @@ radv_entrypoints = custom_target(
   input : ['radv_entrypoints_gen.py', vk_api_xml],
   output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
   command : [
-prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
+prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
 meson.current_build_dir()
   ],
   depend_files : files('radv_extensions.py'),
@@ -34,7 +34,7 @@ radv_extensions_c = custom_target(
   input : ['radv_extensions.py', vk_api_xml],
   output : ['radv_extensions.c', 'radv_extensions.h'],
   command : [
-prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
+prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
 '--out-h', '@OUTPUT1@'
   ],
 )
@@ -43,7 +43,7 @@ vk_format_table_c = custom_target(
   'vk_format_table.c',
   input : ['vk_format_table.py', 'vk_format_layout.csv'],
   output : 'vk_format_table.c',
-  command : [prog_python2, '@INPUT@'],
+  command : [prog_python, '@INPUT@'],
   depend_files : files('vk_format_parse.py'),
   capture : true,
 )
@@ -151,7 +151,7 @@ radeon_icd = custom_target(
   input : 'radv_icd.py',
   output : 'radeon_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@',
   ],
@@ -166,7 +166,7 @@ radv_dev_icd = custom_target(
   input : 'radv_icd.py',
   output : 'dev_icd.json',
   command : [
-prog_python2, '@INPUT@', '--lib-path', meson.current_build_dir(),
+prog_python, '@INPUT@', '--lib-path', meson.current_build_dir(),
 '--out', '@OUTPUT@'
   ],

Re: [Mesa-dev] [PATCH 26/26] meson: Build with Python 3

2018-07-05 Thread Eric Engestrom

On Thursday, 2018-07-05 15:17:57 +0200, Mathieu Bridon wrote:
> 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 

Looking forward to the day we land this patch :P

Reviewed-by: Eric Engestrom 

> ---
>  meson.build   |  6 ++---
>  src/amd/common/meson.build|  2 +-
>  src/amd/vulkan/meson.build| 10 +++
>  src/broadcom/cle/meson.build  |  4 +--
>  src/compiler/glsl/meson.build |  4 +--
>  src/compiler/meson.build  |  2 +-
>  src/compiler/nir/meson.build  | 14 +-
>  src/compiler/spirv/meson.build|  4 +--
>  src/egl/meson.build   |  4 +--
>  src/gallium/auxiliary/meson.build |  6 ++---
>  src/gallium/drivers/freedreno/meson.build |  2 +-
>  src/gallium/drivers/r600/meson.build  |  2 +-
>  src/gallium/drivers/radeonsi/meson.build  |  2 +-
>  .../swr/rasterizer/codegen/meson.build|  8 +++---
>  .../swr/rasterizer/core/backends/meson.build  |  4 +--
>  .../drivers/swr/rasterizer/jitter/meson.build |  6 ++---
>  src/intel/compiler/meson.build|  2 +-
>  src/intel/genxml/meson.build  |  6 ++---
>  src/intel/isl/meson.build |  2 +-
>  src/intel/vulkan/meson.build  | 10 +++
>  src/mapi/es1api/meson.build   |  2 +-
>  src/mapi/es2api/meson.build   |  2 +-
>  src/mapi/glapi/gen/meson.build| 26 +--
>  src/mapi/shared-glapi/meson.build |  2 +-
>  src/mesa/drivers/dri/i965/meson.build |  2 +-
>  src/mesa/main/meson.build |  6 ++---
>  src/mesa/meson.build  |  6 ++---
>  src/meson.build   |  2 +-
>  src/util/meson.build  |  2 +-
>  src/util/xmlpool/meson.build  |  2 +-
>  src/vulkan/util/meson.build   |  2 +-
>  31 files changed, 77 insertions(+), 77 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index b2722c71e5..1b41373793 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -693,10 +693,10 @@ if with_platform_haiku
>pre_args += '-DHAVE_HAIKU_PLATFORM'
>  endif
>  
> -prog_python2 = find_program('python2')
> +prog_python = find_program('python3')
> -has_mako = run_command(prog_python2, '-c', 'import mako')
> +has_mako = run_command(prog_python, '-c', 'import mako')
>  if has_mako.returncode() != 0
> -  error('Python (2.x) mako module required to build mesa.')
> +  error('Python (3.x) mako module required to build mesa.')
>  endif
>  
>  if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6')
> diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
> index 0967b1adb7..6827a02094 100644
> --- a/src/amd/common/meson.build
> +++ b/src/amd/common/meson.build
> @@ -22,7 +22,7 @@ sid_tables_h = custom_target(
>'sid_tables_h',
>input : ['sid_tables.py', 'sid.h', 'gfx9d.h'],
>output : 'sid_tables.h',
> -  command : [prog_python2, '@INPUT@'],
> +  command : [prog_python, '@INPUT@'],
>capture : true,
>  )
>  
> diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
> index 22857926fa..c5c9b308c6 100644
> --- a/src/amd/vulkan/meson.build
> +++ b/src/amd/vulkan/meson.build
> @@ -23,7 +23,7 @@ radv_entrypoints = custom_target(
>input : ['radv_entrypoints_gen.py', vk_api_xml],
>output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
>command : [
> -prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
> +prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
>  meson.current_build_dir()
>],
>depend_files : files('radv_extensions.py'),
> @@ -34,7 +34,7 @@ radv_extensions_c = custom_target(
>input : ['radv_extensions.py', vk_api_xml],
>output : ['radv_extensions.c', 'radv_extensions.h'],
>command : [
> -prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
> +prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
>  '--out-h', '@OUTPUT1@'
>],
>  )
> @@ -43,7 +43,7 @@ vk_format_table_c = custom_target(
>'vk_format_table.c',
>input : ['vk_format_table.py', 'vk_format_layout.csv'],
>output : 'vk_format_table.c',
> -  command : [prog_python2, '@INPUT@'],
> +  command : [prog_python, '@INPUT@'],
>depend_files : files('vk_format_parse.py'),
>capture : true,
>  )
> @@ -151,7 +151,7 @@ radeon_icd = custom_target(
>input : 'radv_icd.py',
>output : 'radeon_icd.@0@.json'.format(host_machine.cpu()),
>command : [
> -prog_python2, '@INPUT@',
> +prog_python, '@INPUT@',
>  '--lib-path', join_paths(get_opti

[Mesa-dev] [PATCH 26/26] meson: Build with Python 3

Re: [Mesa-dev] [PATCH 26/26] meson: Build with Python 3

2 matches

Site Navigation

Mail list logo

Footer information