db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Generate src/build/aclocal.m4 automatically.

Browse Source 
This file is required when macros from the autoconf archive are used in configure.ac
This commit is contained in:
David Steele 2020-03-14 12:48:08 -04:00
parent 9e80c5710e
commit 4cd060b7fe
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -11,8 +11,8 @@ This example is based on Ubuntu 19.04, but it should work on many versions of De
pgbackrest-dev => Install development tools
```
sudo apt-get install rsync git devscripts build-essential valgrind autoconf \
libssl-dev zlib1g-dev libxml2-dev libpq-dev libxml-checker-perl \
libyaml-libyaml-perl libdbd-pg-perl
autoconf-archive libssl-dev zlib1g-dev libxml2-dev libpq-dev \
libxml-checker-perl libyaml-libyaml-perl libdbd-pg-perl
```
Coverage testing is an important component of pgBackRest testing and is integrated directly into the test harness. Unfortunately, the default version of lcov is often not compatible with gcc. lcov 1.14 works up to gcc 8.

4
doc/xml/contributing.xml
View File

@ -57,8 +57,8 @@
<execute user="root" pre="y">
<exe-cmd>
apt-get install rsync git devscripts build-essential valgrind autoconf
libssl-dev zlib1g-dev libxml2-dev libpq-dev libxml-checker-perl
libyaml-libyaml-perl libdbd-pg-perl
autoconf-archive libssl-dev zlib1g-dev libxml2-dev libpq-dev
libxml-checker-perl libyaml-libyaml-perl libdbd-pg-perl
</exe-cmd>
<exe-cmd-extra>-y 2>&amp;1</exe-cmd-extra>
</execute>

1
src/build/aclocal.m4 vendored Normal file
View File

@ -0,0 +1 @@

2
test/Vagrantfile vendored
View File

@ -71,7 +71,7 @@ Vagrant.configure(2) do |config|
#---------------------------------------------------------------------------------------------------------------------------
echo 'Install Build Tools' && date
apt-get install -y devscripts build-essential lintian git cloc txt2man debhelper libssl-dev zlib1g-dev libperl-dev \
libxml2-dev liblz4-dev liblz4-tool libpq-dev valgrind lcov
libxml2-dev liblz4-dev liblz4-tool libpq-dev valgrind lcov autoconf-archive
#---------------------------------------------------------------------------------------------------------------------------
echo 'Install Docker' && date

6
test/test.pl
View File

@ -500,6 +500,12 @@ eval
if (!defined($rstrConfigure) || !defined($$rstrConfigure) ||
$strConfigureAcHash ne substr($$rstrConfigure, length($$rstrConfigure) - 41, 40))
{
# Generate aclocal.m4
my $strAcLocal = executeTest("cd ${strBackRestBase}/src/build && aclocal --OUT=-");
$strAcLocal = trim($strAcLocal) . "\n";
buildPutDiffers($oStorageBackRest, "${strBackRestBase}/src/build/aclocal.m4", $strAcLocal);
# Generate configure
my $strConfigure = executeTest("cd ${strBackRestBase}/src/build && autoconf --output=-");
$strConfigure =