diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-09-30 23:54:06 +0900 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-10-03 12:32:14 +0200 |
| commit | d059aebd99f717d846e7746d5ff5b99d507a3160 (patch) | |
| tree | 1633919698e9d76fdd7e9d72bbeac85caf987954 /external/openssl | |
| parent | a235da83013bb9fccba29d87154aa93235a1c048 (diff) | |
openssl: upgrade to release 3.0.11
Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/configurable-z-option.patch.0 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/external/openssl/configurable-z-option.patch.0 b/external/openssl/configurable-z-option.patch.0 index 9a4426edd5d2..d9478b6a9701 100644 --- a/external/openssl/configurable-z-option.patch.0 +++ b/external/openssl/configurable-z-option.patch.0 @@ -1,15 +1,15 @@ ---- Configurations/10-main.conf.sav 2021-08-24 13:38:47.000000000 +0000 -+++ Configurations/10-main.conf 2021-11-02 22:20:44.377653700 +0000 -@@ -13,7 +13,7 @@ +--- Configurations/10-main.conf.sav 2023-09-19 22:02:31.000000000 +0900 ++++ Configurations/10-main.conf 2023-09-30 23:47:49.734377000 +0900 +@@ -14,7 +14,7 @@ } elsif ($disabled{asm}) { # assembler is still used to compile uplink shim $vc_win64a_info = { AS => "ml64", - ASFLAGS => "/nologo /Zi", + ASFLAGS => "/nologo $$(DEBUG_FLAGS_VALUE)", asflags => "/c /Cp /Cx", - asoutflag => "/Fo" }; - } else { -@@ -41,7 +41,7 @@ + asoutflag => "/Fo", + perlasm_scheme => "masm" }; +@@ -44,7 +44,7 @@ } elsif ($disabled{asm}) { # not actually used, uplink shim is inlined into C code $vc_win32_info = { AS => "ml", @@ -18,7 +18,7 @@ asflags => "/Cp /coff /c /Cx", asoutflag => "/Fo", perlasm_scheme => "win32" }; -@@ -1323,10 +1323,10 @@ +@@ -1333,10 +1333,10 @@ "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS"), |