From: Richard Levitte <levitte@openssl.org>
Date: Sun, 10 Jan 2021 08:26:22 +0000 (+0100)
Subject: Configure: warn about duplicate GENERATE declarations in build.info files
X-Git-Tag: openssl-3.0.0-alpha11~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2497e2e7dbe54420cd98dc2ff013ed5886cd4d8e;p=thirdparty%2Fopenssl.git

Configure: warn about duplicate GENERATE declarations in build.info files

This sort of duplication is permitted, as the end result will be a single
item anyway, but we might as well warn to avoid future confusion.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13824)
---

diff --git a/Configure b/Configure
index 87267e2a26e..ccdb037de2d 100755
--- a/Configure
+++ b/Configure
@@ -2325,7 +2325,7 @@ EOF
             if ($generate{$gen}) {
                 $generator[0] = cleanfile($buildd, $gen, $blddir);
             }
-            $check_generate{$ddest}->{$generator[0]} = 1;
+            $check_generate{$ddest}->{$generator[0]}++;
 
             $unified_info{generate}->{$ddest} = [ @generator ];
         }
@@ -2439,6 +2439,9 @@ EOF
             warn "$_ is GENERATEd by more than one generator ($generators_txt)\n";
             $ambiguous_generation++;
         }
+        if ($check_generate{$_}->{$generators[0]} > 1) {
+            warn "INFO: $_ has more than one GENERATE declaration (same generator)\n"
+        }
     }
     die "There are ambiguous source file generations\n"
         if $ambiguous_generation > 0;