fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 15:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/meson: use python3 interpreter for "generate-setting-docs.py"

Browse source 
Fedora 32 drops "python" from the path. Hence "/usr/bin/env python" won't
work anymore. Of course, who needs a way to invoke the interpreter that works
accross different distributions! WTF.

In this case, easy to work around. We run it from meson, so we have access to
the Python 3 binary. Just call python explicitly, like we do with autotools.

(cherry picked from commit 7c7ad97831)
(cherry picked from commit c162dc00e5)
This commit is contained in:
Thomas Haller 2019-09-25 09:44:14 +02:00
parent 543daa0f5d
commit 1a0b344686
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm/meson.build
View file

@ -269,7 +269,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
@ -278,7 +278,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
depends: libnm_gir,
)
endif