database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

meson: Improve/fix Python version selection

Browse Source 
When we look for the Python installation using the meson python
module, we should make it use the python program previously determined
by the 'PYTHON' option.  Otherwise, it will just use its own search
and the 'PYTHON' option won't affect it.  We need this to be able to
select the Python installation to build PL/Python against.

Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/flat/3f5427e8-cef6-474d-ae88-13db1bfdc1a7%40eisentraut.org
This commit is contained in:
Peter Eisentraut 2023-11-30 07:22:51 +01:00
parent e255b646a1
commit 489ca33081
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1063,7 +1063,7 @@ pyopt = get_option('plpython')
python3_dep = not_found_dep python3_dep = not_found_dep
if not pyopt.disabled() if not pyopt.disabled()
pm = import('python') pm = import('python')
python3_inst = pm.find_installation(required: pyopt) python3_inst = pm.find_installation(python.path(), required: pyopt)
if python3_inst.found() if python3_inst.found()
python3_dep = python3_inst.dependency(embed: true, required: pyopt) python3_dep = python3_inst.dependency(embed: true, required: pyopt)
# Remove this check after we depend on Meson >= 1.1.0 # Remove this check after we depend on Meson >= 1.1.0