external/openssl/configurable-z-option.patch.0 | 2 +- external/openssl/openssl-no-multilib.patch.0 | 4 ++-- external/openssl/opensslios.patch | 12 ------------ 3 files changed, 3 insertions(+), 15 deletions(-)
New commits: commit 983f68e3f5e8bb5c1ac2618fc49f4b01b3de5c0c Author: Taichi Haradaguchi <[email protected]> AuthorDate: Sun Nov 6 18:53:14 2022 +0900 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Nov 10 16:43:56 2022 +0100 external/openssl: fix and remove some patches * configurable-z-option.patch.0, openssl-no-multilib.patch.0: fix patch coverage * opensslios.patch: remove this patch as it is not used. Change-Id: Iaa23e5bb9ca9d63f5ca7451d02726ad24211f078 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142349 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/openssl/configurable-z-option.patch.0 b/external/openssl/configurable-z-option.patch.0 index 3dcf49dc81a6..99d46f75410d 100644 --- a/external/openssl/configurable-z-option.patch.0 +++ b/external/openssl/configurable-z-option.patch.0 @@ -18,7 +18,7 @@ asflags => "/Cp /coff /c /Cx", asoutflag => "/Fo", perlasm_scheme => "win32" }; -@@ -1231,10 +1231,10 @@ +@@ -1252,10 +1252,10 @@ "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS"), diff --git a/external/openssl/openssl-no-multilib.patch.0 b/external/openssl/openssl-no-multilib.patch.0 index 07c45318ac25..3d0083ed4793 100644 --- a/external/openssl/openssl-no-multilib.patch.0 +++ b/external/openssl/openssl-no-multilib.patch.0 @@ -17,7 +17,7 @@ # [no-]zlib [don't] compile support for zlib compression. # zlib-dynamic Like "zlib", but the zlib library is expected to be a shared # library and will be loaded in run-time by the OpenSSL library. -@@ -383,6 +384,7 @@ +@@ -393,6 +394,7 @@ "mdc2", "msan", "multiblock", @@ -25,7 +25,7 @@ "nextprotoneg", "pinshared", "ocb", -@@ -1754,6 +1756,10 @@ +@@ -1770,6 +1772,10 @@ if (-f catfile($srcdir, "test", $_, "build.info")); } diff --git a/external/openssl/opensslios.patch b/external/openssl/opensslios.patch deleted file mode 100644 index 28af92dd473b..000000000000 --- a/external/openssl/opensslios.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/openssl-0.9.8v/Configure -+++ build/openssl-0.9.8v/Configure -@@ -530,6 +530,9 @@ - # iPhoneOS/iOS - "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - -+##### iOS in the LibreOffice case -+"ios-aarch64","clang:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${aarch64_asm}:::::", -+ - ##### A/UX - "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -
