[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  68dc37c12666604f8beac6e59507f809b7fd772b (commit)
      from  5427976d9eddacc87c7e079976bc7738e133dbdc (commit)


- Log -----------------------------------------------------------------
commit 68dc37c12666604f8beac6e59507f809b7fd772b
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 16 10:08:53 2016 +0000

    Disable AFALG when cross-compiling
    
    We don't currently support cross-compiling of the afalg engine. However
    we were failing to explicitly mark it as disabled during Configure leading
    to a failed build.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Configure b/Configure
index 3751067..a4aac21 100755
--- a/Configure
+++ b/Configure
@@ -1208,6 +1208,8 @@ unless ($disabled{afalgeng}) {
             } else {
                 push @{$config{engdirs}}, "afalg";
             }
+        } else {
+            $disabled{afalgeng} = "cross-compiling";
         }
     } else {
         $disabled{afalgeng}  = "not-linux";