From 4d02d500aac80c136e3d6582b908e0fab77bbf42 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 23 Aug 2021 09:06:10 +0200 Subject: Building: For the FIPS module checksum, keep track of configuration,h The FIPS module checksum needs to know that configuration.h is generated from configuration.h.in, so that information is conserved. To make this possible, it's now possible to have attributes with the GENERATE keyword, and the attribute "skip" is added to make a keyword a no-op, which makes it informative only. Reviewed-by: Tomas Mraz Reviewed-by: Todd Short (Merged from https://github.com/openssl/openssl/pull/16378) --- Configurations/gentemplate.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Configurations') diff --git a/Configurations/gentemplate.pm b/Configurations/gentemplate.pm index a02b19a688..4bf19af9c2 100644 --- a/Configurations/gentemplate.pm +++ b/Configurations/gentemplate.pm @@ -56,7 +56,8 @@ sub emit { my $fh = $self->{output}; die "No name?" unless $name; - print $fh "{-\n ", $name, '(', dump_data(\%opts), ');', " \n-}"; + print $fh "{-\n ", $name, '(', dump_data(\%opts), ');', " \n-}" + unless defined $opts{attrs}->{skip}; } my $debug_resolvedepends = $ENV{BUILDFILE_DEBUG_DEPENDS}; @@ -200,7 +201,7 @@ sub dogenerate { my $self = shift; my $src = shift; # Safety measure - return "" unless defined $self->{info}->{generate}->{$_}; + return "" unless defined $self->{info}->{generate}->{$src}; return "" if $cache{$src}; my $obj = shift; my $bin = shift; @@ -209,6 +210,7 @@ sub dogenerate { die "$src is generated by Configure, should not appear in build file\n" if ref $self->{info}->{generate}->{$src} eq ""; my $script = $self->{info}->{generate}->{$src}->[0]; + my %attrs = %{$self->{info}->{attributes}->{generate}->{$src} // {}}; $self->emit('generatesrc', src => $src, product => $bin, @@ -220,6 +222,7 @@ sub dogenerate { defined $bin ? @{$self->{info}->{includes}->{$bin} // []} : () ], defs => [ defined $obj ? @{$self->{info}->{defines}->{$obj} // []} : (), defined $bin ? @{$self->{info}->{defines}->{$bin} // []} : () ], + attrs => { %attrs }, %opts); foreach (@{$self->{info}->{depends}->{$src} // []}) { $self->dogenerate($_, $obj, $bin, %opts); -- cgit v1.2.1