From: Richard Levitte <levitte@openssl.org>
Date: Thu, 15 Nov 2018 20:37:55 +0000 (+0100)
Subject: Configuration: only include shared_sources in dirinfo in shared config
X-Git-Tag: openssl-3.0.0-alpha1~2890
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=856b1b65fa21439f8247a45ffbd44cee74da19af;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7644)
---

diff --git a/Configure b/Configure
index 94e48b4113..cc061dc5e7 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 { @_ };