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/system-cannot-find-path-for-move.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/system-cannot-find-path-for-move.patch.0')
| -rw-r--r-- | external/openssl/system-cannot-find-path-for-move.patch.0 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/external/openssl/system-cannot-find-path-for-move.patch.0 b/external/openssl/system-cannot-find-path-for-move.patch.0 new file mode 100644 index 000000000000..7d08dd636730 --- /dev/null +++ b/external/openssl/system-cannot-find-path-for-move.patch.0 @@ -0,0 +1,22 @@ +--- Configurations/windows-makefile.tmpl 2022-09-09 15:18:35.849924899 +0100 ++++ Configurations/windows-makefile.tmpl 2022-09-09 15:20:28.895825331 +0100 +@@ -777,8 +777,8 @@ + $target: "$gen0" $deps + cmd /C "set "ASM=\$(AS)" & $generator \$@.S" + \$(CPP) $incs $cppflags $defs \$@.S > \$@.i +- move /Y \$@.i \$@ +- del /Q \$@.S ++ mv -f \$@.i \$@ ++ rm -f \$@.S + EOF + } + # Otherwise.... +@@ -790,7 +790,7 @@ + return <<"EOF"; + $target: "$gen0" $deps + \$(CPP) $incs $cppflags $defs "$gen0" > \$@.i +- move /Y \$@.i \$@ ++ mv -f \$@.i \$@ + EOF + } elsif ($gen0 =~ m|^.*\.in$|) { + # |