tdf#169387 tdf#168461 Use Py_InitializeFromConfig
The commit below tried to change pythonloader to set the Python home
using PyConfig instead of setting PYTHONHOME. However, it only built up
the PyConfig locally on the stack and never actually passed it to
Python. This meant that when building with Python versions >= 3.8 the
Python home was never actually set. When using an internal Python, it
ended up printing an error message about not being able to find platform
independent libraries.
commit da0e9240bf
Author: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Date: Thu Dec 21 12:01:50 2023 +0200
tdf#158447 Use PyConfig for setting Python home directory with Python >= 3.8
Change-Id: Ic5b7c60613b22f5215cb1a2a13fecf3e0946ca49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161089
Change-Id: Icda3b0e538b958a04357027c486fd3af17a8fca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211289
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
committed by
Ilmari Lauhakangas
parent
5b36e890ec
commit
e11160b50b
@@ -245,7 +245,11 @@ void pythonInit() {
|
||||
#endif
|
||||
|
||||
// initialize python
|
||||
#if PY_VERSION_HEX >= 0x03080000
|
||||
Py_InitializeFromConfig(&config);
|
||||
#else
|
||||
Py_Initialize();
|
||||
#endif
|
||||
#if PY_VERSION_HEX < 0x03090000
|
||||
PyEval_InitThreads();
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user