From b35ecb2c8dcd71608f98af1e0ec19d965099ceab Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Wed, 17 May 2023 09:40:02 -0500 Subject: [PATCH postgres v1 12/17] Make finding pkg-config(python3) more robust It is a possibility that the installation can't be found. Checking for Python.h is redundant with what Meson does internally. https://github.com/mesonbuild/meson/blob/master/mesonbuild/dependencies/python.py#L218 --- meson.build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 83bc1c7b25..8dbd9b660b 100644 --- a/meson.build +++ b/meson.build @@ -1053,15 +1053,13 @@ endif ############################################################### pyopt = get_option('plpython') +python3_dep = not_found_dep if not pyopt.disabled() pm = import('python') - python3_inst = pm.find_installation(required: pyopt.enabled()) - python3_dep = python3_inst.dependency(embed: true, required: pyopt.enabled()) - if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt.enabled()) - python3_dep = not_found_dep + python3_inst = pm.find_installation(required: pyopt) + if python3_inst.found() + python3_dep = python3_inst.dependency(embed: true, required: pyopt) endif -else - python3_dep = not_found_dep endif -- Tristan Partin Neon (https://neon.tech)