diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-14 23:16:53 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-23 18:18:12 +0100 |
| commit | f719443a3055a17db3ea13bfaff83a243a9d3194 (patch) | |
| tree | 81d4d74ed082b4166350bb848afb2a9c7062d967 /external/openssl/openssl-1.0.1h-win64.patch.1 | |
| parent | e68b6af532dc2504b8c4c9a1f2916aed71923d8c (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)
(cherry picked from commit f3e98f199de288f689bcca21251a4f8d3930a366)
Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948
Diffstat (limited to 'external/openssl/openssl-1.0.1h-win64.patch.1')
| -rw-r--r-- | external/openssl/openssl-1.0.1h-win64.patch.1 | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/external/openssl/openssl-1.0.1h-win64.patch.1 b/external/openssl/openssl-1.0.1h-win64.patch.1 deleted file mode 100644 index aea914633ebb..000000000000 --- a/external/openssl/openssl-1.0.1h-win64.patch.1 +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat -index 8768dc6..6772390 100755 ---- a/ms/do_win64a.bat -+++ b/ms/do_win64a.bat -@@ -1,19 +1,19 @@ --perl util\mkfiles.pl >MINFO -+perl util/mkfiles.pl >MINFO - - cmd /c "nasm -f win64 -v" >NUL 2>&1 - if %errorlevel% neq 0 goto ml64 - --perl ms\uplink-x86_64.pl nasm > ms\uptable.asm --nasm -f win64 -o ms\uptable.obj ms\uptable.asm -+perl ms/uplink-x86_64.pl nasm > ms/uptable.asm -+nasm -f win64 -o ms/uptable.obj ms/uptable.asm - goto proceed - - :ml64 --perl ms\uplink-x86_64.pl masm > ms\uptable.asm --ml64 -c -Foms\uptable.obj ms\uptable.asm -+perl ms/uplink-x86_64.pl masm > ms/uptable.asm -+ml64 -c -Foms/uptable.obj ms/uptable.asm - - :proceed --perl util\mk1mf.pl VC-WIN64A >ms\nt.mak --perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak -+perl util/mk1mf.pl VC-WIN64A >ms/nt.mak -+perl util/mk1mf.pl dll VC-WIN64A >ms/ntdll.mak - --perl util\mkdef.pl 32 libeay > ms\libeay32.def --perl util\mkdef.pl 32 ssleay > ms\ssleay32.def -+perl util/mkdef.pl 32 libeay > ms/libeay32.def -+perl util/mkdef.pl 32 ssleay > ms/ssleay32.def -diff --git a/util/mk1mf.pl b/util/mk1mf.pl -index 72fa089..d98def1 100755 ---- a/util/mk1mf.pl -+++ b/util/mk1mf.pl -@@ -233,6 +233,9 @@ else - $cflags.=' -DTERMIO'; - } - -+# force unix style path separator -+${o} = "/"; -+ - $fipsdir =~ s/\//${o}/g; - - $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":""); |