diff options
Diffstat (limited to 'dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch')
| -rw-r--r-- | dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch deleted file mode 100644 index 9cbc63a08c01..000000000000 --- a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch +++ /dev/null @@ -1,29 +0,0 @@ -By default generate-version-script.py uses /usr/bin/python3, whatever -version that may be - which causes problems if the default python3 -installation is one either built without XML support or not included -in PYTHON_TARGETS of dev-python/setuptools. Make sure the script is -invoked using the same interpreter as meson itself, as that one is -already guaranteed to provide both 'xml' and 'pkg_resources'. - ---- a/libjcat/meson.build -+++ b/libjcat/meson.build -@@ -129,6 +129,11 @@ - install : true, - ) - -+ # Make sure generate-version-script.py is invoked by the same python as meson, -+ # as that one must already have both XML support and setuptools. -+ python = import('python') -+ python_interpreter = python.find_installation() -+ - # Verify the map file is correct -- note we can't actually use the generated - # file for two reasons: - # -@@ -141,6 +146,7 @@ - input: jcat_gir[0], - output: 'jcat.map', - command: [ -+ python_interpreter, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBJCAT', - '@INPUT@', |