From b57412d2d0b2ead8b418b87653fd2373bec102cb Mon Sep 17 00:00:00 2001 From: tbkizle Date: Thu, 28 Mar 2024 02:28:17 -0400 Subject: [PATCH] Fix Error In Some Cases With With Meson Python Not Found In some cases meson does not find python or python for the right arch, fix this by using the projects meson param to specify the python installation currently being used. https://github.com/wingtk/gvsbuild/blob/acd2a4a9faee3d987cfc36b48fa8e7d7d3e52ec8/gvsbuild/projects/gobject_introspection.py#L64 https://github.com/wingtk/gvsbuild/issues/1298 --- gvsbuild/projects/pycairo.py | 5 +++-- gvsbuild/projects/pygobject.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gvsbuild/projects/pycairo.py b/gvsbuild/projects/pycairo.py index 42592697b..a39c30930 100644 --- a/gvsbuild/projects/pycairo.py +++ b/gvsbuild/projects/pycairo.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, see . - +import sys from pathlib import Path from gvsbuild.utils.base_builders import Meson @@ -33,7 +33,8 @@ def __init__(self): ) def build(self): - Meson.build(self) + py_dir = Path(sys.executable).parent + Meson.build(self, meson_params=f'-Dpython="{py_dir}\\python.exe"') cairo_inc = Path(self.builder.gtk_dir) / "include" / "cairo" self.builder.mod_env("INCLUDE", str(cairo_inc)) self.exec_vs(r"%(python_dir)s\python.exe -m build") diff --git a/gvsbuild/projects/pygobject.py b/gvsbuild/projects/pygobject.py index 0b3260158..166e4e58d 100644 --- a/gvsbuild/projects/pygobject.py +++ b/gvsbuild/projects/pygobject.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, see . - +import sys from pathlib import Path from gvsbuild.utils.base_builders import Meson @@ -38,7 +38,8 @@ def __init__(self): ) def build(self): - Meson.build(self) + py_dir = Path(sys.executable).parent + Meson.build(self, meson_params=f'-Dpython="{py_dir}\\python.exe"') gtk_dir = self.builder.gtk_dir add_inc = [ str(Path(gtk_dir) / "include" / "cairo"),