b4dfba9477
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>
29 lines
861 B
Makefile
29 lines
861 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
|
|
|
|
$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
|
|
|
|
ifeq ($(COM),MSC)
|
|
$(eval $(call gb_ExternalPackage_add_files,openssl,$(LIBO_LIB_FOLDER),\
|
|
libcrypto-1_1.dll \
|
|
libssl-1_1.dll \
|
|
))
|
|
ifneq ($(DISABLE_PYTHON),TRUE)
|
|
ifneq ($(SYSTEM_PYTHON),TRUE)
|
|
$(eval $(call gb_ExternalPackage_add_files,openssl,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib, \
|
|
libcrypto-1_1.dll \
|
|
libssl-1_1.dll \
|
|
))
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|