dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meson, tools: sys.executable is not the same as python.full_path()

Browse source 
This avoids using the python chosen by Meson's find_program(),
which is not the one from find_installation() and can not have GI.

(cherry picked from commit 61c078fa43)
This commit is contained in:
Bruno Lopes 2026-01-22 17:59:49 -03:00
parent 3e66da424d
commit bb827160f4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -1933,6 +1933,7 @@ gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
if get_option('debug-self-in-build')
gimp_run_env.set('GIMP_DEBUG_SELF', '1')
endif
gimp_run_env.set('GIMP_PYTHON_WITH_GI', python.full_path())
if meson.can_run_host_binaries() and have_gobject_introspection
if enable_console_bin

10
tools/in-build-gimp.py
View file

@ -41,13 +41,13 @@ try:
if not new_rpath in regex:
subprocess.run(["install_name_tool", "-add_rpath", new_rpath, binary], check=True)
#Ensure the same python (sys.executable) from meson.build is used by plugins
#This is needed because sys.executable can not coincide with python3 from shebang
#(on MacPorts, there is no python3, so we would wrongly use Xcode python without GI)
#Ensure the same python from meson.build (GIMP_PYTHON_WITH_GI) is used by plugins
#This is needed because GIMP_PYTHON_WITH_GI can not coincide with python3 from shebang
#(on MacPorts, there is no python3 symlink, so we would misuse Xcode python3 without GI)
python_symlink = shutil.which("python3")
pygobject_found=False
different_python=False
if python_symlink and not os.path.samefile(python_symlink, sys.executable):
if python_symlink and not os.path.samefile(python_symlink, os.environ.get("GIMP_PYTHON_WITH_GI")):
result = subprocess.run([python_symlink,"-c","import sys, gi; version='3.0'; sys.exit(gi.check_version(version))"], check=False)
pygobject_found = (result.returncode == 0)
if not python_symlink or (python_symlink and not pygobject_found):
@ -56,7 +56,7 @@ try:
os.makedirs(tmp_path, exist_ok=True)
tmp_symlink = os.path.join(tmp_path, "python3")
if not os.path.exists(tmp_symlink):
os.symlink(sys.executable, tmp_symlink)
os.symlink(os.environ.get("GIMP_PYTHON_WITH_GI"), tmp_symlink)
os.environ["PATH"] = tmp_path + os.pathsep + os.environ.get("PATH", "")
if "GIMP_DEBUG_SELF" in os.environ and shutil.which("gdb"):