diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-15 17:40:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-16 18:07:24 +0200 |
| commit | 5d942028845b69d761116bb6dfdbee6e095c0d17 (patch) | |
| tree | 02ae5314033f9164cfc8d50b06adae7f06c60cf8 /Configurations | |
| parent | fc661b50dfedfed1b067782665e0452ed964c22c (diff) | |
Configurations/unix-Makefile.tmpl: Don't specify headers twice
When building in the source tree, a rebuilt Makefile detected both
include/openssl/foo.h.in and include/openssl/foo.h, so promptly added
include/openssl/foo.h twice to the list of headers to parse in 'make
update'
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12882)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 90ec900b6a..7eb4ea76a6 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1083,8 +1083,8 @@ errors: include/openssl/ebcdic.h include/openssl/opensslconf.h include/openssl/symhacks.h ) ); - our @cryptoheaders = (); - our @sslheaders = (); + our %cryptoheaders = (); + our %sslheaders = (); foreach my $d ( qw( include/openssl include/internal ) ) { my @header_patterns = map { catfile($config{sourcedir}, $d, $_) } ( '*.h', '*.h.in' ); @@ -1104,20 +1104,20 @@ errors: # file to be added must be either in the public header directory # or one of the pre-declared internal headers, and must under no # circumstances be one of those that must be skipped. - push @cryptoheaders, $new_f + $cryptoheaders{$new_f} = 1 if (($d eq 'include/openssl' || ( grep { $_ eq $fn } @cryptoheaders_tmpl )) && !( grep { $_ eq $fn } @cryptoskipheaders )); # The logic to add files to @sslheaders is much simpler... - push @sslheaders, $new_f if grep { $_ eq $fn } @sslheaders_tmpl; + $sslheaders{$new_f} = 1 if grep { $_ eq $fn } @sslheaders_tmpl; } } ""; -} CRYPTOHEADERS={- join(" \\\n" . ' ' x 14, - fill_lines(" ", $COLUMNS - 14, sort @cryptoheaders)) -} + fill_lines(" ", $COLUMNS - 14, sort keys %cryptoheaders)) -} SSLHEADERS={- join(" \\\n" . ' ' x 11, - fill_lines(" ", $COLUMNS - 11, sort @sslheaders)) -} + fill_lines(" ", $COLUMNS - 11, sort keys %sslheaders)) -} ordinals: build_generated $(PERL) $(SRCDIR)/util/mknum.pl --version $(VERSION) --no-warnings \ --ordinals $(SRCDIR)/util/libcrypto.num \ |