db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

Use a checksum to build configure.ac more efficiently.

Browse Source 
Building the configure.ac script can take multiple seconds depending on the state of the autoconf cache. Use a checksum to only rebuild when configure.ac has changed no matter how the timestamps have changed.
This commit is contained in:
David Steele
2020-03-14 12:39:29 -04:00
parent 748f9502eb
commit 9e80c5710e
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/.gitignore vendored
View File

@@ -1,5 +1,5 @@
/.build
/autom4te.cache
autom4te.cache
/config.log
/config.status
/Makefile

2
src/configure vendored
View File

@@ -5267,3 +5267,5 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
# Generated from src/build/configure.ac sha1 ebb41aa471ed3dc451cf95db394ec83bf08f759d

35
test/test.pl
View File

@@ -14,6 +14,7 @@ use English '-no_match_vars';
# Convert die to confess to capture the stack trace
$SIG{__DIE__} = sub { Carp::confess @_ };
use Digest::SHA qw(sha1_hex);
use File::Basename qw(dirname);
use Getopt::Long qw(GetOptions);
use Cwd qw(abs_path cwd);
@@ -486,21 +487,33 @@ eval
#-----------------------------------------------------------------------------------------------------------------------
if (!$bSmart || grep(/^src\/build\/configure\.ac/, @stryModifiedList))
{
my $strConfigure = executeTest("autoconf ${strBackRestBase}/src/build/configure.ac");
# Trim off any trailing LFs
$strConfigure = trim($strConfigure) . "\n";
# Remove unused options from help
$strConfigure =~ s/^ --((?!bin).)*dir=DIR.*\n//mg;
$strConfigure =~ s/^ --sbindir=DIR.*\n//mg;
# Save into the src dir
# Set build file
my @stryBuilt;
my $strBuilt = 'src/configure';
if (buildPutDiffers($oStorageBackRest, "${strBackRestBase}/${strBuilt}", $strConfigure))
# Get configure.ac and configure to see if anything has changed
my $strConfigureAc = ${$oStorageBackRest->get('src/build/configure.ac')};
my $strConfigureAcHash = sha1_hex($strConfigureAc);
my $rstrConfigure = $oStorageBackRest->get($oStorageBackRest->openRead($strBuilt, {bIgnoreMissing => true}));
# Check if configure needs to be regenerated
if (!defined($rstrConfigure) || !defined($$rstrConfigure) ||
$strConfigureAcHash ne substr($$rstrConfigure, length($$rstrConfigure) - 41, 40))
{
# Generate configure
my $strConfigure = executeTest("cd ${strBackRestBase}/src/build && autoconf --output=-");
$strConfigure =
trim($strConfigure) . "\n\n# Generated from src/build/configure.ac sha1 ${strConfigureAcHash}\n";
# Remove unused options from help
$strConfigure =~ s/^ --((?!bin).)*dir=DIR.*\n//mg;
$strConfigure =~ s/^ --sbindir=DIR.*\n//mg;
# Save into the src dir
$oStorageBackRest->put(
$oStorageBackRest->openWrite("${strBackRestBase}/${strBuilt}", {strMode => '0755'}), $strConfigure);
# Add to built list
push(@stryBuilt, $strBuilt);
push(@stryBuiltAll, @stryBuilt);
push(@stryModifiedList, @stryBuilt);