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-ipc-cmd.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-ipc-cmd.patch.0')
| -rw-r--r-- | external/openssl/openssl-no-ipc-cmd.patch.0 | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/external/openssl/openssl-no-ipc-cmd.patch.0 b/external/openssl/openssl-no-ipc-cmd.patch.0 new file mode 100644 index 000000000000..f844831a34ae --- /dev/null +++ b/external/openssl/openssl-no-ipc-cmd.patch.0 @@ -0,0 +1,65 @@ +--- util/perl/OpenSSL/config.pm 2022-09-08 11:45:57.408532119 +0100 ++++ util/perl/OpenSSL/config.pm 2022-09-08 11:47:46.877590711 +0100 +@@ -15,7 +15,7 @@ + use warnings; + use Getopt::Std; + use File::Basename; +-use IPC::Cmd; ++# use IPC::Cmd; + use POSIX; + use Carp; + +@@ -193,7 +193,8 @@ + + # Look for ISC/SCO with its unique uname program + sub is_sco_uname { +- return undef unless IPC::Cmd::can_run('uname'); ++ return undef; ++# return undef unless IPC::Cmd::can_run('uname'); + + open UNAME, "uname -X 2>/dev/null|" or return ''; + my $line = ""; +@@ -291,13 +292,13 @@ + $CCVENDOR = ''; # Dunno, don't care (unless found later) + + # Find a compiler if we don't already have one +- if ( ! $cc ) { +- foreach (@c_compilers) { +- next unless IPC::Cmd::can_run("$CROSS_COMPILE$_"); +- $CC = $_; +- last; +- } +- } ++# if ( ! $cc ) { ++# foreach (@c_compilers) { ++# next unless IPC::Cmd::can_run("$CROSS_COMPILE$_"); ++# $CC = $_; ++# last; ++# } ++# } + + if ( $CC ) { + # Find the compiler vendor and version number for certain compilers +@@ -352,14 +353,14 @@ + } + } + +- if ( ${SYSTEM} eq 'AIX' ) { +- # favor vendor cc over gcc +- if (IPC::Cmd::can_run('cc')) { +- $CC = 'cc'; +- $CCVENDOR = ''; # Determine later +- $CCVER = 0; +- } +- } ++# if ( ${SYSTEM} eq 'AIX' ) { ++# # favor vendor cc over gcc ++# if (IPC::Cmd::can_run('cc')) { ++# $CC = 'cc'; ++# $CCVENDOR = ''; # Determine later ++# $CCVER = 0; ++# } ++# } + + if ( $SYSTEM eq "SunOS" ) { + # check for Oracle Developer Studio, expected output is "cc: blah-blah C x.x blah-blah" |