diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-14 23:16:53 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-25 18:57:40 +0100 |
| commit | 8301e45cbdbf7fb37736565fcdfc22d33b2eb0b4 (patch) | |
| tree | 672205caa68bd0f64a6359dcb249bb0f1ac253f5 /external/openssl/UnpackedTarball_openssl.mk | |
| parent | f60e081efd4d5902bbbd5545513bd41fb3ea4e90 (diff) | |
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 'external/openssl/UnpackedTarball_openssl.mk')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 43fcb93293fd..6f00cf7f7e44 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -12,18 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl)) $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl)) $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ - external/openssl/openssllnx.patch \ - external/openssl/opensslwnt.patch \ - $(if $(filter INTEL,$(CPUNAME)),external/openssl/opensslwnt_safeseh.patch) \ - external/openssl/openssl-1.0.1h-win64.patch.1 \ - external/openssl/opensslsol.patch \ - external/openssl/opensslios.patch \ - external/openssl/opensslosxppc.patch \ - external/openssl/openssl-3650-masm.patch.1 \ - external/openssl/openssl-fixbuild.patch.1 \ - external/openssl/openssl-macos-arm64.patch.1 \ - external/openssl/openssl-1.0.2k-cve-2020-1971.patch.1 \ - external/openssl/ccb0a11145ee72b042d10593a64eaf9e8a55ec12.patch.1 \ + external/openssl/openssl-no-multilib.patch.0 \ )) # vim: set noet sw=4 ts=4: |