root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Don't try to make configuration leaner 

This partially reverts Github PR #16378:
commit 764cf5b263, titled "Configuration:
only produce a new configdata.pm if it has changed contents"

Unfortunately, the attempt to make configuration leaner didn't take
into account all the files that may or may not affect the outcome of
`configdata.pm`, and most of all, didn't take into account that `Makefile`
has clauses of its own to determined when a reconfiguration is needed, all
based on time stamps.

Something as simple as a changed `Configurations/10-main.conf`, where the
change doesn't affect the resulting `configdata.pm` gets `make` into a
reconfiguration loop, because `configdata.pm` is older than `10-main.conf`.

The lesson to remember is not to try to outsmart `make` in cases like this.

We retain the other parts of the PR mentioned, as they are still valid.

needed to be taken into account (all the Configurations/*.conf
as well as all the build.info)

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/18832)
This commit is contained in:
Richard Levitte 2022-07-20 12:49:54 +02:00
parent cbb1cda67f
commit 54a84f0299
1 changed files with 12 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Configure
View File

@ -17,7 +17,6 @@ use lib "$FindBin::Bin/util/perl";
use File::Basename; use File::Basename;
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs splitdir/; use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs splitdir/;
use File::Path qw/mkpath/; use File::Path qw/mkpath/;
use File::Compare qw(compare_text);
use OpenSSL::fallback "$FindBin::Bin/external/perl/MODULES.txt"; use OpenSSL::fallback "$FindBin::Bin/external/perl/MODULES.txt";
use OpenSSL::Glob; use OpenSSL::Glob;
use OpenSSL::Template; use OpenSSL::Template;
@ -2843,59 +2842,20 @@ $configdata_tmpl->fill_in(
) or die $Text::Template::ERROR; ) or die $Text::Template::ERROR;
close CONFIGDATA; close CONFIGDATA;
# When using stat() on Windows, we can get it to perform better by avoid some rename "$configdata_outname.new", $configdata_outname;
# data. This doesn't affect the mtime field, so we're not losing anything... if ($builder_platform eq 'unix') {
${^WIN32_SLOPPY_STAT} = 1; my $mode = (0755 & ~umask);
chmod $mode, 'configdata.pm'
my $update_configdata = 0; or warn sprintf("WARNING: Couldn't change mode for 'configdata.pm' to 0%03o: %s\n",$mode,$!);
my $run_configdata = 0;
if (-f $configdata_outname) {
my $Configure_mtime = (stat($0))[9];
my $configdata_mtime = (stat($configdata_outname))[9];
# If this script was updated after the last configdata.pm, or if
# configdata.pm.new differs from configdata.pm, we update configdata.pm
if ($configdata_mtime < $Configure_mtime
|| compare_text("$configdata_outname.new", $configdata_outname) != 0) {
$update_configdata = 1;
} else {
# If nothing has changed, let's just drop the new one and pretend
# like nothing happened
unlink "$configdata_outname.new";
# We still run configdata.pm if one of the build file (Makefile) or
# the configuration header file are missing
$run_configdata =
!( -f $target{build_file} )
|| !( -f catfile('include', 'openssl', 'configuration.h') );
}
} else {
$update_configdata = 1;
} }
print "Created $configdata_outname\n";
if ($update_configdata) { print "Running $configdata_outname\n";
# If something did change, or there was no previous configdata.pm, we my $perlcmd = (quotify("maybeshell", $config{PERL}))[0];
# rename the new one, set permissions as needed, and run it. my $cmd = "$perlcmd $configdata_outname";
rename "$configdata_outname.new", $configdata_outname; #print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
if ($builder_platform eq 'unix') { system($cmd);
my $mode = (0755 & ~umask); exit 1 if $? != 0;
chmod $mode, 'configdata.pm'
or warn sprintf("WARNING: Couldn't change mode for 'configdata.pm' to 0%03o: %s\n",$mode,$!);
}
$run_configdata = 1;
print "Created $configdata_outname\n";
}
if ($run_configdata) {
print "Running $configdata_outname\n";
my $perlcmd = (quotify("maybeshell", $config{PERL}))[0];
my $cmd = "$perlcmd $configdata_outname";
#print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
system($cmd);
exit 1 if $? != 0;
} else {
print "No changes in $configdata_outname, no need to run it\n";
}
$SIG{__DIE__} = $orig_death_handler; $SIG{__DIE__} = $orig_death_handler;