The branch master has been updated
via 5800d0414be113b6d710c1a23a8097842cfc675b (commit)
via 3eb84c62859591eccab32fababe0314942e09461 (commit)
from b9b2135d22b93f949fd77f293925fc66158416ff (commit)
- Log -----------------------------------------------------------------
commit 5800d0414be113b6d710c1a23a8097842cfc675b
Author: Matt Caswell <m...@openssl.org>
Date: Thu Nov 5 15:13:25 2020 +0000
Correct system guessing for solaris64-x86_64-* targets
Previously the system guessing script was choosing a target that did not
exist for these platforms.
Fixes #13323
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13327)
commit 3eb84c62859591eccab32fababe0314942e09461
Author: Matt Caswell <m...@openssl.org>
Date: Thu Nov 5 14:56:45 2020 +0000
Don't complain about uninitialized values when running Configure
If a system understands `uname -X` then the Configure script will attempt
to use uninitialized values.
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13327)
-----------------------------------------------------------------------
Summary of changes:
util/perl/OpenSSL/config.pm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index c2dbd33bd1..fb9c5ca11b 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -202,8 +202,8 @@ sub is_sco_uname {
}
close UNAME;
return "" if $line eq '';
- my @fields = split($line);
- return $fields[2];
+ my @fields = split(/\s+/, $line);
+ return $fields[2] // '';
}
sub get_sco_type {
@@ -704,13 +704,16 @@ EOF
my $KERNEL_BITS = $ENV{KERNEL_BITS};
my $ISA64 = `isainfo 2>/dev/null | grep amd64`;
my $KB = $KERNEL_BITS // '64';
- return { target => "solaris64-x86_64" }
- if $ISA64 ne "" && $KB eq '64';
+ if ($ISA64 ne "" && $KB eq '64') {
+ return { target => "solaris64-x86_64-gcc" } if $CCVENDOR eq
"gnu";
+ return { target => "solaris64-x86_64-cc" };
+ }
my $REL = uname('-r');
$REL =~ s/5\.//;
my @tmp_disable = ();
push @tmp_disable, 'sse2' if int($REL) < 10;
- return { target => "solaris-x86",
+ #There is no solaris-x86-cc target
+ return { target => "solaris-x86-gcc",
disable => [ @tmp_disable ] };
}
],
