diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-11-03 13:34:28 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-11-04 11:58:33 +0100 |
| commit | dbd5667793f2b333e7e00e720bb09d917a3468db (patch) | |
| tree | 38c29f2230792bf7504a07edbdd1b436d95d370d /external/openssl | |
| parent | f633ca7fcdc64a2d30f1682a7dda51fd9f693879 (diff) | |
external/openssl: fix and remove some patches
* openssl-no-multilib.patch.0: fix patch coverage
* opensslios.patch: remove this patch as it is not used.
Change-Id: I4651fc4107992bdaaefc2af3d0ff04c7bf26fa87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142190
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/openssl-no-multilib.patch.0 | 8 | ||||
| -rw-r--r-- | external/openssl/opensslios.patch | 12 |
2 files changed, 4 insertions, 16 deletions
diff --git a/external/openssl/openssl-no-multilib.patch.0 b/external/openssl/openssl-no-multilib.patch.0 index 83137fe5b712..da9adf35785a 100644 --- a/external/openssl/openssl-no-multilib.patch.0 +++ b/external/openssl/openssl-no-multilib.patch.0 @@ -1,6 +1,6 @@ --- Configure.orig 2020-04-21 14:22:39.000000000 +0200 +++ Configure 2020-07-07 17:25:19.256297500 +0200 -@@ -28,7 +28,7 @@ +@@ -27,7 +27,7 @@ my $orig_death_handler = $SIG{__DIE__}; $SIG{__DIE__} = \&death_handler; @@ -9,7 +9,7 @@ my $banner = <<"EOF"; -@@ -87,6 +87,7 @@ +@@ -86,6 +86,7 @@ # If disabled, it also disables shared and dynamic-engine. # no-asm do not use assembler # no-egd do not compile support for the entropy-gathering daemon APIs @@ -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. -@@ -459,6 +460,7 @@ +@@ -458,6 +459,7 @@ "module", "msan", "multiblock", @@ -25,7 +25,7 @@ "nextprotoneg", "ocb", "ocsp", -@@ -1917,6 +1919,10 @@ +@@ -1907,6 +1909,10 @@ my @build_dirs = ( [ ] ); # current directory 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:::", - |