Commit f770d75b authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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



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

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5755)
parent 37a38595

Configurations/15-android.conf

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


    sub android_ndk {

        unless (%$android_ndk) {

            if ($now_printing =~ m|^android|) {

                return $android_ndk = { bn_ops => "BN_AUTO" };

            }



            my $ndk = $ENV{ANDROID_NDK};

            die "\$ANDROID_NDK is not defined"  if (!$ndk);

            die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms");

Configure

+8 −4
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ my $apitable = { 
our %table = ();

our %config = ();

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 ###############################################
@@ -3108,8 +3112,8 @@ sub env 


sub print_table_entry

{

    my $target = shift;

    my %target = resolve_config($target);

    local $now_printing = shift;

    my %target = resolve_config($now_printing);

    my $type = shift;



    # Don't print the templates
@@ -3178,7 +3182,7 @@ sub print_table_entry 


    if ($type eq "TABLE") {

	print "\n";

	print "*** $target\n";

	print "*** $now_printing\n";

        foreach (@sequence) {

            if (ref($target{$_}) eq "ARRAY") {

                printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}});
@@ -3189,7 +3193,7 @@ sub print_table_entry 
    } elsif ($type eq "HASH") {

	my $largest =

	    length((sort { length($a) <=> length($b) } @sequence)[-1]);

	print "    '$target' => {\n";

	print "    '$now_printing' => {\n";

	foreach (@sequence) {

	    if ($target{$_}) {

                if (ref($target{$_}) eq "ARRAY") {