From: Richard Levitte <levitte@openssl.org>
Date: Thu, 3 Oct 2019 22:00:24 +0000 (+0200)
Subject: Configure: Implement attributes for DEPEND[xxx]
X-Git-Tag: openssl-3.0.0-alpha1~1176
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9eba5933a5ae80030ba66f79e625c4382811769e;p=oweals%2Fopenssl.git

Configure: Implement attributes for DEPEND[xxx]

We want to attach attributes on dependencies.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
---

diff --git a/Configure b/Configure
index 9185f5dccc..7ea13c1a51 100755
--- a/Configure
+++ b/Configure
@@ -1922,10 +1922,17 @@ if ($builder eq "unified") {
             => sub { push @{$defines{$expand_variables->($+{INDEX})}},
                          tokenize($expand_variables->($+{VALUE}))
                          if !@skip || $skip[$#skip] > 0 },
-            qr/^\s* DEPEND ${index_re} = ${value_re} $/x
-            => sub { push @{$depends{$expand_variables->($+{INDEX})}},
-                         tokenize($expand_variables->($+{VALUE}))
-                         if !@skip || $skip[$#skip] > 0 },
+            qr/^\s* DEPEND ${index_re} ${attribs_re} = ${value_re} $/x
+            => sub {
+                if (!@skip || $skip[$#skip] > 0) {
+                    my $i = $expand_variables->($+{INDEX});
+                    my @d = tokenize($expand_variables->($+{VALUE}));
+                    push @{$depends{$i}}, @d;
+                    $handle_attributes->($+{ATTRIBS},
+                                         \$attributes{depends}->{$i},
+                                         @d);
+                }
+            },
             qr/^\s* GENERATE ${index_re} = ${value_re} $/x
             => sub { push @{$generate{$expand_variables->($+{INDEX})}},
                          $+{VALUE}
@@ -2096,6 +2103,11 @@ EOF
                 my $e = $1 // "";
                 $d = $`.$e;
                 $unified_info{depends}->{$ddest}->{$d} = 1;
+
+                # Fix up associated attributes
+                $unified_info{attributes}->{depends}->{$ddest}->{$d} =
+                    $attributes{depends}->{$dest}->{$_}
+                    if defined $attributes{depends}->{$dest}->{$_};
             }
         }