diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-09-08 11:08:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-09-10 15:34:54 +0200 |
commit | a539db002bc9ee6692d14cde2aaa166bd213eb51 (patch) | |
tree | 0fecfa56562c89d8d017d6240953c19787ca3965 /external/openssl/openssl-no-multilib.patch.0 | |
parent | 779e6fbef37119e9ad0cd2f63915b23c5645dab3 (diff) |
upgrade to openssl-3.0.5
patch out using IPC::Cmd instead of requiring adding it
to build-time dependencies
for mysterious:
The system cannot find the path specified.
NMAKE : fatal error U1077: '""C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x86\cl.exe' : return code '0x1'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x86\nmake.exe"' : return code '0x2'
Stop.
include fix from https://github.com/openssl/openssl/issues/18823
and for
move /Y crypto/aes/aes-586.asm.i crypto/aes/aes-586.asm
The system cannot find the path specified.
NMAKE : fatal error U1077: 'move' : return code '0x1'
add own patch to use mv and rm for move and del
Change-Id: I071750e20efd0931ea1c5c3b49e7a5173c7283f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139641
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/openssl/openssl-no-multilib.patch.0')
-rw-r--r-- | external/openssl/openssl-no-multilib.patch.0 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/external/openssl/openssl-no-multilib.patch.0 b/external/openssl/openssl-no-multilib.patch.0 index 07c45318ac25..83137fe5b712 100644 --- a/external/openssl/openssl-no-multilib.patch.0 +++ b/external/openssl/openssl-no-multilib.patch.0 @@ -1,15 +1,15 @@ --- Configure.orig 2020-04-21 14:22:39.000000000 +0200 +++ Configure 2020-07-07 17:25:19.256297500 +0200 -@@ -24,7 +24,7 @@ +@@ -28,7 +28,7 @@ my $orig_death_handler = $SIG{__DIE__}; $SIG{__DIE__} = \&death_handler; -my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; +my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [no-multilib] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; - # Options: - # -@@ -59,6 +59,7 @@ + my $banner = <<"EOF"; + +@@ -87,6 +87,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,22 +17,22 @@ # [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 @@ - "mdc2", +@@ -459,6 +460,7 @@ + "module", "msan", "multiblock", + "multilib", "nextprotoneg", - "pinshared", "ocb", -@@ -1754,6 +1756,10 @@ - if (-f catfile($srcdir, "test", $_, "build.info")); - } + "ocsp", +@@ -1917,6 +1919,10 @@ + + my @build_dirs = ( [ ] ); # current directory + if ($disabled{"multilib"}) { + $target{"multilib"} = ""; + } -+ ++ $config{build_infos} = [ ]; - my %ordinals = (); + # We want to detect configdata.pm in the source tree, so we |