wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configure: make LIST command work with dynamic 15-android.conf.

Browse source 
This is quick-n-dirty ad-hoc solution, the problem asks for more
elegant one...

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5755)
This commit is contained in:
Andy Polyakov 2018-03-26 12:35:57 +02:00
parent 37a3859564
commit f770d75b1c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configurations/15-android.conf
View file

@ -16,6 +16,10 @@
sub android_ndk { sub android_ndk {
unless (%$android_ndk) { unless (%$android_ndk) {
if ($now_printing =~ m|^android|) {
return $android_ndk = { bn_ops => "BN_AUTO" };
}
my $ndk = $ENV{ANDROID_NDK}; my $ndk = $ENV{ANDROID_NDK};
die "\$ANDROID_NDK is not defined" if (!$ndk); die "\$ANDROID_NDK is not defined" if (!$ndk);
die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms"); die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms");

12
Configure
View file

@ -179,6 +179,10 @@ my $apitable = {
our %table = (); our %table = ();
our %config = (); our %config = ();
our %withargs = (); our %withargs = ();
our $now_printing; # set to current entry's name in print_table_entry
# (todo: right thing would be to encapsulate name
# into %target [class] and make print_table_entry
# a method)
# Forward declarations ############################################### # Forward declarations ###############################################
@ -3108,8 +3112,8 @@ sub env
sub print_table_entry sub print_table_entry
{ {
my $target = shift; local $now_printing = shift;
my %target = resolve_config($target); my %target = resolve_config($now_printing);
my $type = shift; my $type = shift;
# Don't print the templates # Don't print the templates
@ -3178,7 +3182,7 @@ sub print_table_entry
if ($type eq "TABLE") { if ($type eq "TABLE") {
print "\n"; print "\n";
print "*** $target\n"; print "*** $now_printing\n";
foreach (@sequence) { foreach (@sequence) {
if (ref($target{$_}) eq "ARRAY") { if (ref($target{$_}) eq "ARRAY") {
printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}}); printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}});
@ -3189,7 +3193,7 @@ sub print_table_entry
} elsif ($type eq "HASH") { } elsif ($type eq "HASH") {
my $largest = my $largest =
length((sort { length($a) <=> length($b) } @sequence)[-1]); length((sort { length($a) <=> length($b) } @sequence)[-1]);
print " '$target' => {\n"; print " '$now_printing' => {\n";
foreach (@sequence) { foreach (@sequence) {
if ($target{$_}) { if ($target{$_}) {
if (ref($target{$_}) eq "ARRAY") { if (ref($target{$_}) eq "ARRAY") {