diff options
Diffstat (limited to 'main/spice/python-module-check.patch')
| -rw-r--r-- | main/spice/python-module-check.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/main/spice/python-module-check.patch b/main/spice/python-module-check.patch deleted file mode 100644 index a41ecf96b8b..00000000000 --- a/main/spice/python-module-check.patch +++ /dev/null @@ -1,37 +0,0 @@ -Patch-Source: https://gitlab.freedesktop.org/spice/spice-common/-/commit/a7b5474bf808934cf0ee1107a58d5f4d97b9afbf -From a7b5474bf808934cf0ee1107a58d5f4d97b9afbf Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio <freddy77@gmail.com> -Date: Thu, 28 Oct 2021 16:45:34 +0100 -Subject: [PATCH] build: Correctly check for Python modules - -Currently using Meson the command "python -m <MODULE_NAME>" is -run. However this command instead of trying to import the module -tried to execute it as a script failing for the updated pyparsing -with: - - /usr/bin/python3: No module named pyparsing.__main__; 'pyparsing' is a package and cannot be directly executed - -So instead use "python -c 'import <MODULE_NAME>". -Autoconf is already using that command (see m4/ax_python_module.m4). - -Signed-off-by: Frediano Ziglio <freddy77@gmail.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index aff6243..eeccecd 100644 ---- a/subprojects/spice-common/meson.build -+++ b/subprojects/spice-common/meson.build -@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code - if get_option('python-checks') - foreach module : ['six', 'pyparsing'] - message('Checking for python module @0@'.format(module)) -- cmd = run_command(python, '-m', module) -+ cmd = run_command(python, '-c', 'import @0@'.format(module)) - if cmd.returncode() != 0 - error('Python module @0@ not found'.format(module)) - endif --- -GitLab - |