diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-14 01:14:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-14 01:14:50 +0000 |
| commit | 94eb99943eafb48140b436b347abaaee77209c01 (patch) | |
| tree | bb4f0519a6c0880b24c88b1666976a36a464a8df /dev-util/meson/files/meson-1.2.1-python-path.patch | |
| parent | a7ec94f7d22ee22df2e424c1d3f842510b7993aa (diff) | |
gentoo auto-resync : 14:01:2024 - 01:14:49
Diffstat (limited to 'dev-util/meson/files/meson-1.2.1-python-path.patch')
| -rw-r--r-- | dev-util/meson/files/meson-1.2.1-python-path.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/dev-util/meson/files/meson-1.2.1-python-path.patch b/dev-util/meson/files/meson-1.2.1-python-path.patch deleted file mode 100644 index d6151881f83f..000000000000 --- a/dev-util/meson/files/meson-1.2.1-python-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2b33c94e6315e9a397dd48a58a5becb0df3b8aba Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sat, 12 Aug 2023 09:56:44 +0100 -Subject: [PATCH 2/2] python module: Respect PATH when python is not given in - machine file - -We should only fall back to the Python interpreter running Meson itself -if `python3` is not found in the PATH. - -https://github.com/mesonbuild/meson/pull/12116 - -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 5654e4231..2b2395a9b 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py -@@ -381,7 +381,9 @@ class PythonModule(ExtensionModule): - - def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> MaybePythonProg: - if not name_or_path: -- python = PythonExternalProgram('python3', mesonlib.python_command) -+ python = PythonExternalProgram('python3') -+ if not python.found(): -+ python = PythonExternalProgram('python3', mesonlib.python_command) - else: - tmp_python = ExternalProgram.from_entry(display_name, name_or_path) - python = PythonExternalProgram(display_name, ext_prog=tmp_python) |