[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  856b1b65fa21439f8247a45ffbd44cee74da19af (commit)
      from  c7af8b0a267981c25cc42643493289a01ffe1bbd (commit)


- Log -----------------------------------------------------------------
commit 856b1b65fa21439f8247a45ffbd44cee74da19af
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 15 21:37:55 2018 +0100

    Configuration: only include shared_sources in dirinfo in shared config
    
    Without this precaution, we end up having directory targets depend on
    shlib object files for which there are no rules.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7644)

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

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

diff --git a/Configure b/Configure
index 94e48b4..cc061dc 100755
--- a/Configure
+++ b/Configure
@@ -2249,6 +2249,9 @@ EOF
                                            dst => 'sources' } }
                } -> {$prodtype};
             foreach my $kind (keys %$intent) {
+                next if ($intent->{$kind}->{dst} eq 'shared_sources'
+                             && $disabled{shared});
+
                 my @src = @{$intent->{$kind}->{src}};
                 my $dst = $intent->{$kind}->{dst};
                 my $prodselect = $intent->{$kind}->{prodselect} // sub { @_ };