[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fffb1c5496e47dacc8245bd140f6955a31c5ea6f (commit)
       via  ff455d993ce13dbc8e308753aa15310f94231fab (commit)
      from  5848be0488c20591892f82a7c79c6d1637518b96 (commit)


- Log -----------------------------------------------------------------
commit fffb1c5496e47dacc8245bd140f6955a31c5ea6f
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 28 10:07:32 2018 +0200

    Configurations/10-main.conf: fix VC-noCE-common template.
    
    picker() is type agnostic, but its output consumer is not. Or rather
    it doesn't work if picker() picks nothing when consumer expects
    array. So ensure array is returned when array is expected.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5770)

commit ff455d993ce13dbc8e308753aa15310f94231fab
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 28 10:06:32 2018 +0200

    Configure: harmonize syntax.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5770)

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

Summary of changes:
 Configurations/10-main.conf |  3 ++-
 Configure                   | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 0f7bdf2..03a53d3 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1285,7 +1285,8 @@ my %targets = (
                                        sub {
                                            ($disabled{shared} ? "" : "/MD");
                                        })),
-        defines          => add(picker(debug   => [ "DEBUG", "_DEBUG" ])),
+        defines          => add(picker(default => [], # works as type cast
+                                       debug   => [ "DEBUG", "_DEBUG" ])),
         lib_cflags       => add(sub { $disabled{shared} ? "/MT /Zl" : () }),
         # Following might/should appears controversial, i.e. defining
         # /MDd without evaluating $disabled{shared}. It works in
diff --git a/Configure b/Configure
index 8770090..bd8fd39 100755
--- a/Configure
+++ b/Configure
@@ -593,13 +593,13 @@ my %target_attr_translate =(
    );
 
 # Initialisers coming from 'config' scripts
-$config{defines} = [ split(/$list_separator_re/, env('__CNF_CPPDEFINES')) ],
-$config{includes} = [ split(/$list_separator_re/, env('__CNF_CPPINCLUDES')) ],
-$config{cppflags} = [ env('__CNF_CPPFLAGS') || () ],
-$config{cflags} = [ env('__CNF_CFLAGS') || () ],
-$config{cxxflags} = [ env('__CNF_CXXFLAGS') || () ],
-$config{lflags} = [ env('__CNF_LDFLAGS') || () ],
-$config{ex_libs} = [ env('__CNF_LDLIBS') || () ],
+$config{defines} = [ split(/$list_separator_re/, env('__CNF_CPPDEFINES')) ];
+$config{includes} = [ split(/$list_separator_re/, env('__CNF_CPPINCLUDES')) ];
+$config{cppflags} = [ env('__CNF_CPPFLAGS') || () ];
+$config{cflags} = [ env('__CNF_CFLAGS') || () ];
+$config{cxxflags} = [ env('__CNF_CXXFLAGS') || () ];
+$config{lflags} = [ env('__CNF_LDFLAGS') || () ];
+$config{ex_libs} = [ env('__CNF_LDLIBS') || () ];
 
 $config{openssl_api_defines}=[];
 $config{openssl_algorithm_defines}=[];