[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5de75fb4fb0a0f724c259a5477603c7d0dfd2235 (commit)
       via  58163021e29530e99aea85eafe8653907bff03a8 (commit)
      from  efc943be56df26ceac2504d57c4ecbe2bb113c97 (commit)


- Log -----------------------------------------------------------------
commit 5de75fb4fb0a0f724c259a5477603c7d0dfd2235
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 22 19:17:55 2016 +0100

    Use $disabled{shared} in a safer manner
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 58163021e29530e99aea85eafe8653907bff03a8
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 22 19:17:06 2016 +0100

    The build files use %disabled, make sure to pass it to them
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure      | 2 +-
 Makefile.in    | 2 +-
 util/dofile.pl | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 04ed030..63d3e03 100755
--- a/Configure
+++ b/Configure
@@ -1599,7 +1599,7 @@ use warnings;
 use Exporter;
 #use vars qw(\@ISA \@EXPORT);
 our \@ISA = qw(Exporter);
-our \@EXPORT = qw(\%config \%target %withargs %unified_info);
+our \@EXPORT = qw(\%config \%target %disabled %withargs %unified_info);
 
 EOF
 print OUT "our %config = (\n";
diff --git a/Makefile.in b/Makefile.in
index 9513003..924dfa0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,7 +193,7 @@ TOP=    .
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
-SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' unless $disabled{shared} -}
+SHARED_LIBS={- $disabled{shared} ? '' : '$(SHARED_CRYPTO) $(SHARED_SSL)'  -}
 SHARED_CFLAG={- $target{shared_cflag} -}
 SHARED_LDFLAG={- $target{shared_ldflag}
                  # Unlike other OSes (like Solaris, Linux, Tru64,
diff --git a/util/dofile.pl b/util/dofile.pl
index 78b8dfe..983778f 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -183,6 +183,7 @@ sub output_off {
 $template->fill_in(OUTPUT => \*STDOUT,
                    HASH => { config => \%config,
                              target => \%target,
+                             disabled => \%disabled,
                              withargs => \%withargs,
                              unified_info => \%unified_info,
                              autowarntext => \@autowarntext,