diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-14 23:16:53 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-12-09 18:50:40 +0100 |
| commit | 854b6132ce0453d125a4bb4dca58b564336dbd04 (patch) | |
| tree | 84420d2025fee6f0afa56c55f229dce80f4284b7 /RepositoryExternal.mk | |
| parent | Support for Windows Security Zones for macro enable/disable (diff) | |
| download | core-854b6132ce0453d125a4bb4dca58b564336dbd04.tar.gz core-854b6132ce0453d125a4bb4dca58b564336dbd04.zip | |
openssl: update to 1.1.1g
The OpenSSL 1.1.1 release is currently the only supported version
and it already has the Windows Arm64 support I was looking for.
This change also explicitly enables thread support, which Python
depends on since release 3.7, which removed the --without-threads
build option. But the explicit OPENSSL_THREADS was just added in
3.8.4, so the old no-threads build fails now and was wrong since
probably much longer.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98435
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 0911b0a26356aa53bb94a1d2171f36e6c2e28749)
Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5eb997b3ff7f..2afe604ba26f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1570,13 +1570,14 @@ define gb_LinkTarget__use_openssl $(call gb_LinkTarget_use_package,$(1),openssl) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libssl.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ + $(if $(filter $(OS),LINUX),-pthread) \ ) $(call gb_LinkTarget_use_external_project,$(1),openssl) ifeq ($(OS),SOLARIS) |