[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  f770d75b1cac264d6280ec7326277daff6965cbb (commit)
      from  37a385956461ab526ecea2739a8a40364a8db259 (commit)


- Log -----------------------------------------------------------------
commit f770d75b1cac264d6280ec7326277daff6965cbb
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 26 12:35:57 2018 +0200

    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: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5755)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/15-android.conf |  4 ++++
 Configure                      | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 551f71b..d117386 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -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");
diff --git a/Configure b/Configure
index 7a2ef9b..8770090 100755
--- a/Configure
+++ b/Configure
@@ -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") {