[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9e381e8a018592a2a42e83df402e1ef921469e9f (commit)
      from  16ff13427f00753a76672317143753b83cea7982 (commit)


- Log -----------------------------------------------------------------
commit 9e381e8a018592a2a42e83df402e1ef921469e9f
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Thu Jan 25 22:50:55 2018 +0100

    Configure: allow to enable afalgeng if target does not start with Linux
    
    The Debian build system uses a `debian' target which sets CFLAGS and
    then we have for instance debian-amd64 which inherits from
    linux-x86_64 and debian [0]. So far so good.
    
    Unless there are different suggestions how to do this, I would keep it.
    However since the target name does not start with `linux', the build
    system does not enable the afalg engine. So in order to get enabled, I
    added a
    	`enable           => [ "afalgeng" ],'
    to the generic linux config which sets it explicit (as suggested by
    Richard Levitte). Having this set, we can check for it instead matching
    the target name.
    
    [0] https://sources.debian.org/src/openssl/1.1.0g-2/Configurations/20-debian.conf/
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5169)

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

Summary of changes:
 Configurations/10-main.conf | 1 +
 Configure                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 6c73d9f..a0a9e17 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -679,6 +679,7 @@ my %targets = (
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-Wl,-znodelete",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
+        enable           => [ "afalgeng" ],
     },
     "linux-generic64" => {
         inherit_from     => [ "linux-generic32" ],
diff --git a/Configure b/Configure
index adb098e..ca90a75 100755
--- a/Configure
+++ b/Configure
@@ -1518,7 +1518,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
 
 unless ($disabled{afalgeng}) {
     $config{afalgeng}="";
-    if ($target =~ m/^linux/) {
+    if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
         my $minver = 4*10000 + 1*100 + 0;
         if ($config{CROSS_COMPILE} eq "") {
             my $verstr = `uname -r`;