diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-14 23:35:57 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-04-01 19:01:29 +0200 |
| commit | d2715de5b0a3bd4b5eabe99d8cf1edf52ca5b65f (patch) | |
| tree | dc35d688bf5a3ce12c4669d27d2f1b364eef0f4e /configure.ac | |
| parent | 862fca25e274620d2051c269e93e7ad59b0f3a14 (diff) | |
python3: update to 3.8.4
With all the prerequisites in place, LO can be updated to the
current Python release. Interestingly I found that Cygwin always
seems to use LC_COLLATE=C, probably because the default collation
rules are missing.
Then there are the changes introduced in "PEP 587 -- Python
Initialization Configuration", which appearingly have modified the
DLL search path behaviour on Windows, so the OpenSLL DLLs aren't
found anymore in the program directory. As a workaround, the
OpenSLL and libffi DLLs are now (also) installed into the Python
lib dir on Windows.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit b4dfba947768834ffecc09056992019878711c8b)
Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1b29e4c0f74c..15ea25352455 100644 --- a/configure.ac +++ b/configure.ac @@ -8977,8 +8977,8 @@ int main(int argc, char **argv) { internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 - PYTHON_VERSION_MINOR=7 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10 + PYTHON_VERSION_MINOR=8 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi |