[PATCH] meson: use built-in 'modules' helper for python dependencies

[PATCH] meson: use built-in 'modules' helper for python dependencies

[luca.boccassi]

From: Luca Boccassi <bluca@debian.org>

We now require Meson 0.53 or later, so we can use this feature introduced
in 0.51. This also fixes a build failure on SUSE Leap 15.6.

Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 buildtools/meson.build | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 72447b60a0..3adf34e1a8 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -5,7 +5,11 @@ pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
 
-python3 = import('python').find_installation(required: false)
+python3_required_modules = []
+if host_machine.system() != 'windows'
+    python3_required_modules = ['elftools']
+endif
+python3 = import('python').find_installation('python3', required: false, modules: python3_required_modules)
 if python3.found()
     py3 = [python3]
 else
@@ -45,16 +49,3 @@ else
     pmdinfogen += 'elf'
 endif
 
-# TODO: starting from Meson 0.51.0 use
-#     python3 = import('python').find_installation('python',
-#        modules : python3_required_modules)
-python3_required_modules = []
-if host_machine.system() != 'windows'
-    python3_required_modules = ['elftools']
-endif
-foreach module : python3_required_modules
-    script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
-    if run_command(py3, '-c', script.format(module), check: false).returncode() != 0
-        error('missing python module: @0@'.format(module))
-    endif
-endforeach
-- 
2.43.0

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[Dmitry Kozlyuk]

2024-06-23 13:30 (UTC+0100), luca.boccassi@gmail.com:
> From: Luca Boccassi <bluca@debian.org>
> 
> We now require Meson 0.53 or later, so we can use this feature introduced
> in 0.51. This also fixes a build failure on SUSE Leap 15.6.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[Bruce Richardson]

On Sun, Jun 23, 2024 at 01:30:23PM +0100, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
> 
> We now require Meson 0.53 or later, so we can use this feature introduced
> in 0.51. This also fixes a build failure on SUSE Leap 15.6.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[David Marchand]

On Sun, Jun 23, 2024 at 2:30 PM <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <bluca@debian.org>
>
> We now require Meson 0.53 or later, so we can use this feature introduced
> in 0.51. This also fixes a build failure on SUSE Leap 15.6.

@Luca
The patch lgtm, but could you develop on what was wrong with SUSE?


> Cc: stable@dpdk.org

@Kevin.
Just a note, this patch is probably not relevant to 21.11 as the
switch to meson 0.53.2 was done in 22.11.

>
> Signed-off-by: Luca Boccassi <bluca@debian.org>


-- 
David Marchand

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[Kevin Traynor]

On 24/06/2024 10:15, David Marchand wrote:
> On Sun, Jun 23, 2024 at 2:30 PM <luca.boccassi@gmail.com> wrote:
>>
>> From: Luca Boccassi <bluca@debian.org>
>>
>> We now require Meson 0.53 or later, so we can use this feature introduced
>> in 0.51. This also fixes a build failure on SUSE Leap 15.6.
> 
> @Luca
> The patch lgtm, but could you develop on what was wrong with SUSE?
> 
> 
>> Cc: stable@dpdk.org
> 
> @Kevin.
> Just a note, this patch is probably not relevant to 21.11 as the
> switch to meson 0.53.2 was done in 22.11.
> 
Ack. thanks for letting me know.

>>
>> Signed-off-by: Luca Boccassi <bluca@debian.org>
> 
> 

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[Luca Boccassi]

On Mon, 24 Jun 2024 at 10:16, David Marchand <david.marchand@redhat.com> wrote:
>
> On Sun, Jun 23, 2024 at 2:30 PM <luca.boccassi@gmail.com> wrote:
> >
> > From: Luca Boccassi <bluca@debian.org>
> >
> > We now require Meson 0.53 or later, so we can use this feature introduced
> > in 0.51. This also fixes a build failure on SUSE Leap 15.6.
>
> @Luca
> The patch lgtm, but could you develop on what was wrong with SUSE?

The separate manual check is causing it to pick a different
non-default python3 version, which doesn't have elftools installed,
which breaks the meson run:

https://build.opensuse.org/package/live_build_log/home:bluca:dpdk/dpdk/openSUSE_Leap_15.6/x86_64

Re: [PATCH] meson: use built-in 'modules' helper for python dependencies

[David Marchand]

On Mon, Jun 24, 2024 at 10:15 AM Bruce Richardson
<bruce.richardson@intel.com> wrote:
> On Sun, Jun 23, 2024 at 01:30:23PM +0100, luca.boccassi@gmail.com wrote:
> > From: Luca Boccassi <bluca@debian.org>
> >
> > We now require Meson 0.53 or later, so we can use this feature introduced
> > in 0.51. This also fixes a build failure on SUSE Leap 15.6.
> >
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Applied, thanks.


-- 
David Marchand