summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-07-14 23:35:57 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2020-07-17 10:15:06 +0200
commitb4dfba947768834ffecc09056992019878711c8b (patch)
tree6823d867383ca1ad5f025c6fb5e0dc540280c11e /RepositoryExternal.mk
parentlibffi: build DLL on Windows (diff)
downloadcore-b4dfba947768834ffecc09056992019878711c8b.tar.gz
core-b4dfba947768834ffecc09056992019878711c8b.zip
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. Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 28e009af194d..096fbea6bebf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3193,7 +3193,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
else
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,python3) \
- -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
+ -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
)
endif