Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc79ca04

Browse files
committed
meson: Make detection of python more robust
Previously we errored out if no python installation could be found (but we didhandle not having enough of python installed to build plpythonagainst). Presumably nobody hit this so far, as python is likely installed dueto meson requiring python.Author: Tristan Partin <tristan@neon.tech>Discussion:https://postgr.es/m/CSPIJVUDZFKX.3KHMOAVGF94RV@c3poBackpatch: 16-, where meson support was added
1 parent1ad3a7b commitc79ca04

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

‎meson.build

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,17 @@ endif
10521052
###############################################################
10531053

10541054
pyopt=get_option('plpython')
1055+
python3_dep= not_found_dep
10551056
ifnot pyopt.disabled()
10561057
pm=import('python')
10571058
python3_inst= pm.find_installation(required: pyopt)
1058-
python3_dep= python3_inst.dependency(embed:true,required: pyopt)
1059-
ifnot cc.check_header('Python.h',dependencies: python3_dep,required: pyopt)
1060-
python3_dep= not_found_dep
1059+
if python3_inst.found()
1060+
python3_dep= python3_inst.dependency(embed:true,required: pyopt)
1061+
# Remove this check after we depend on Meson >= 1.1.0
1062+
ifnot cc.check_header('Python.h',dependencies: python3_dep,required: pyopt)
1063+
python3_dep= not_found_dep
1064+
endif
10611065
endif
1062-
else
1063-
python3_dep= not_found_dep
10641066
endif
10651067

10661068

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp