diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-11-08 13:05:39 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-11-28 15:32:24 +0100 |
| commit | 7ea19dd9086c9afe1a044716ca7f9643442a846c (patch) | |
| tree | 14aa21998e9b8a74f0ed2f8b0fe24ff5823b5009 /external | |
| parent | bfdaa3f59bcf87f341138202c047dd4b28acb28a (diff) | |
openssl: patch out another call to IPC::Cmd
... which is used when cross-compiling.
Change-Id: I08f5ccd5d9418a81c9b1273667133065552325dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143387
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/openssl-no-ipc-cmd.patch.0 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/external/openssl/openssl-no-ipc-cmd.patch.0 b/external/openssl/openssl-no-ipc-cmd.patch.0 index 75ed669eabc9..7f75b8ce64fe 100644 --- a/external/openssl/openssl-no-ipc-cmd.patch.0 +++ b/external/openssl/openssl-no-ipc-cmd.patch.0 @@ -63,3 +63,21 @@ if ( $SYSTEM eq "SunOS" ) { # check for Oracle Developer Studio, expected output is "cc: blah-blah C x.x blah-blah" +--- util/perl/OpenSSL/config.pm.orig 2022-11-08 12:54:59.751298823 +0100 ++++ util/perl/OpenSSL/config.pm 2022-11-08 12:55:16.436287053 +0100 +@@ -52,13 +52,13 @@ + my @cc_version = + ( + clang => sub { +- return undef unless IPC::Cmd::can_run("$CROSS_COMPILE$CC"); ++ return undef; # unless IPC::Cmd::can_run("$CROSS_COMPILE$CC"); + my $v = `$CROSS_COMPILE$CC -v 2>&1`; + $v =~ m/(?:(?:clang|LLVM) version|.*based on LLVM)\s+([0-9]+\.[0-9]+)/; + return $1; + }, + gnu => sub { +- return undef unless IPC::Cmd::can_run("$CROSS_COMPILE$CC"); ++ return undef; # unless IPC::Cmd::can_run("$CROSS_COMPILE$CC"); + my $nul = File::Spec->devnull(); + my $v = `$CROSS_COMPILE$CC -dumpversion 2> $nul`; + # Strip off whatever prefix egcs prepends the number with. |