build: pkg-config related cleanup

hebasto commented at 4:29 pm on October 20, 2020: member

This PR:

does not change behavior
drops redundant AC_SUBST macros

Also checks of PKG_CHECK_MODULES presence are removed because they are redundant due to the following code https://github.com/bitcoin/bitcoin/blob/ab1feadf4e6cd4f5f2c7e74cea1c7baad61458ba/configure.ac#L16-L20

DrahtBot added the label Build system on Oct 20, 2020

practicalswift commented at 7:18 pm on October 20, 2020: contributor

Concept ACK: nice cleanup!

DrahtBot commented at 1:26 am on October 21, 2020: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#23593 (build: remove x-prefix’s from comparisons by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

MarcoFalke added the label Needs gitian build on Oct 21, 2020

MarcoFalke added the label Needs Guix build on Oct 21, 2020

DrahtBot commented at 10:18 am on October 22, 2020: member

Gitian builds

File	commit f5bd46a4cc6d395ce71ecb99852c1774235a249c(master)	commit 04440de7a43624b9a6a5fd46d862e0657db068f0(master and this pull)
bitcoin-core-linux-0.21-res.yml	`d1971dabc444008d...`	`8838745241d98124...`
bitcoin-core-osx-0.21-res.yml	`de235a951f7a465e...`	`8f9ed1309b7f5c59...`
bitcoin-core-win-0.21-res.yml	`f75ce7b9355d334c...`	`0095a1e80251d3fc...`
*-aarch64-linux-gnu-debug.tar.gz	`6ed9c70434fc7fc2...`	`5052c6411649fccc...`
*-aarch64-linux-gnu.tar.gz	`3af5f18ffa364c24...`	`b0bbace4cf060ffc...`
*-arm-linux-gnueabihf-debug.tar.gz	`098fc410215e7c42...`	`9b4c157495ab8c63...`
*-arm-linux-gnueabihf.tar.gz	`3f2c975b713698b2...`	`c6f5bb430a8f5e0a...`
*-osx-unsigned.dmg	`012c0dc0e1b3f2ec...`	`81f9b08f08a61bc7...`
*-osx64.tar.gz	`6409b02ac19538f2...`	`981a9ae130f0b89b...`
*-riscv64-linux-gnu-debug.tar.gz	`6da1f76714b4dbfe...`	`1725940365cef94b...`
*-riscv64-linux-gnu.tar.gz	`a90367c39515c3b4...`	`560b503bdb7628e7...`
*-win64-debug.zip	`453e395581992f20...`	`21488d77f7715465...`
*-win64-setup-unsigned.exe	`8b50662e73d518ea...`	`03ad1e82b83721dc...`
*-win64.zip	`aa74cb3b0978fb5a...`	`51b82f6af40f0c8d...`
*-x86_64-linux-gnu-debug.tar.gz	`7e318d3ab76e48eb...`	`ebbbcd45726e5557...`
*-x86_64-linux-gnu.tar.gz	`6447ef245d9ee8f6...`	`27f66b6a9f4b9581...`
*.tar.gz	`8bce7f0b98fd7610...`	`a800bbf485510ee8...`
linux-build.log	`3c348dc643432917...`	`bb8655d9c8c9882d...`
osx-build.log	`083ca63c793f3b21...`	`a397d39f533360f8...`
win-build.log	`72ceb0afecdf12df...`	`ab3d3efa33edf7e1...`
bitcoin-core-linux-0.21-res.yml.diff		`e421ec65fcac167c...`
bitcoin-core-osx-0.21-res.yml.diff		`2653e6f1032c3e86...`
bitcoin-core-win-0.21-res.yml.diff		`f0c6dbfab6ec264d...`
linux-build.log.diff		`7bcbcfea271adddf...`
osx-build.log.diff		`5858ab1be42c8f17...`
win-build.log.diff		`ed21fe1c3e6be38c...`

DrahtBot removed the label Needs gitian build on Oct 22, 2020

DrahtBot commented at 4:26 am on October 24, 2020: member

Guix builds

File	commit 9af7c1993b3512a7230f723b1923abd496989c59(master)	commit a997e711d9317d8985130ac366b5434045999309(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`a0883e94fe7d7b45...`	`12036f243e35253a...`
*-aarch64-linux-gnu.tar.gz	`f515a87f3d749152...`	`1cb7616d8452f208...`
*-arm-linux-gnueabihf-debug.tar.gz	`200e141a7d2c4169...`	`e3aefabffd6985fc...`
*-arm-linux-gnueabihf.tar.gz	`a9f0d5752bab18d4...`	`bb0fe75229ed11e3...`
*-riscv64-linux-gnu-debug.tar.gz	`862c0b91637b1d13...`	`9c9d76b8a4b273c3...`
*-riscv64-linux-gnu.tar.gz	`b7ddd167f9c6089c...`	`b82551dcaffe4588...`
*-win-unsigned.tar.gz	`d9fd15e501580e57...`	`628755f876612d40...`
*-win64-debug.zip	`65810928272e2290...`	`04307877af5e37c7...`
*-win64-setup-unsigned.exe	`95eeb02773751b70...`	`1f42a9ced373ad78...`
*-win64.zip	`39e8e65f96ba0048...`	`5d2d34a254b1d89c...`
*-x86_64-linux-gnu-debug.tar.gz	`5dc4fdbe449bd036...`	`98fbdf2376371c49...`
*-x86_64-linux-gnu.tar.gz	`3949c68642f0c01a...`	`aebe97182d4516b7...`
*.tar.gz	`333868caaa79db4d...`	`79dda477ed97f075...`
guix_build.log	`33920a430da60d00...`	`5d56f54db9e48cd5...`
guix_build.log.diff		`a66d1f1972961842...`

DrahtBot removed the label Needs Guix build on Oct 24, 2020

laanwj commented at 10:42 am on November 19, 2020: member

drops redundant AC_SUBST macros

What makes these redundant?

hebasto commented at 10:49 am on November 19, 2020: member

drops redundant AC_SUBST macros

What makes these redundant?

From commit message:

Variables that are declared with AC_ARG_VAR macro are substituted via AC_SUBST macro. PKG_CHECK_MODULES macro already has AC_ARG_VAR(${PACKAGE}_CFLAGS) and AC_ARG_VAR(${PACKAGE}_LIBS).

Also https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Setting-Output-Variables.html#index-AC_005fARG_005fVAR-1209

laanwj commented at 2:26 pm on November 19, 2020: member

Thanks. Yes, clear. But otoh that seems pretty deeply buried. I think one advantage of specifying them explicitly is to have a better idea what gets exported from the configure.ac script, what its interface is to the makefiles and config.h file.

DrahtBot added the label Needs rebase on Nov 23, 2020

hebasto commented at 3:11 pm on November 26, 2020: member

@laanwj

I think one advantage of specifying them explicitly is to have a better idea what gets exported from the configure.ac script, what its interface is to the makefiles and config.h file.

PKG_CHECK_MODULES has a pretty self-documenting feature, as its internal AC_ARG_VAR include variable description in the variable section of ./configure --help.

hebasto force-pushed on Nov 26, 2020

hebasto commented at 3:25 pm on November 26, 2020: member

Rebased ae92fb1e103c17302fdbf03b1bbd04c6919c7920 -> 58737de5807445aeb3bc89e8215f85a1df0f398f (pr20201.01 -> pr20201.02) due to the conflict with #20202.

DrahtBot removed the label Needs rebase on Nov 26, 2020

DrahtBot added the label Needs rebase on Jan 7, 2021

hebasto force-pushed on Jan 8, 2021

hebasto commented at 0:01 am on January 8, 2021: member

Rebased 58737de5807445aeb3bc89e8215f85a1df0f398f -> ab1feadf4e6cd4f5f2c7e74cea1c7baad61458ba (pr20201.02 -> pr20201.03) due to the conflict with #18077.

DrahtBot removed the label Needs rebase on Jan 8, 2021

bitmastercoin commented at 7:07 am on January 11, 2021: none

Running Kali Linux. 2020.4 and getting the error after attempting sudo ./autogen.sh with the out put being a long string and eventually. ::

configure.ac:16: error: possibly undefined macro: AC_MSG_ERROR
 If this token and others are legitimate, please use m4_pattern_allow.
 See the Autoconf documentation.
 configure.ac:255: error: possibly undefined macro: AC_DEFINE
 configure.ac:632: error: possibly undefined macro: AC_MSG_WARN
 autoreconf: /usr/bin/autoconf failed with exit status: 1

hebasto commented at 7:36 am on January 11, 2021: member

@bitmastercoin What happens when you do the same on the master branch?

jarolrod commented at 11:59 pm on August 10, 2021: member

@bitmastercoin I was able to successfully build and and run with Kali Linux 2020.4 and 2021.1 on master branch and PR branch. Can you give any update?

jarolrod commented at 1:25 am on August 11, 2021: member

Concept ACK, I cannot ACK yet because I want to confirm the reproducibility of the stripped information with the bitcoin-maintainer-tools/build-for-compare.py script, but I’m currently running into the following issue:

0>>> [do_build] Command failed: git apply /home/xyz/Bitcoin/Code/revie/test-reproducibility/bitcoin-maintainer-tools/patches/stripbuildinfo.patch
1>>> [do_build] Could not apply patch to strip build info. Probably it needs to be updated

I tried running on the PR branch itself, and the PR branch rebased on the current master, but no luck. Obviously, I am not a maintainer, so any help would be appreciated 😊

Notes: I wanted to try to document what is going on here and give my opinion.

388135bcf91bcc665417b59980468db270e48d9a
- Commit 388135bcf91bcc665417b59980468db270e48d9a states that it is removing a redundant check of PKG_CHECK_MODULES. If we look at the pkg.m4 source code, and specifically lines 131-142, we can see that performing this check within our configure.ac script is in fact redundant.
ab1feadf4e6cd4f5f2c7e74cea1c7baad61458ba
- From my understanding, the AC_SUBT macro is meant to provide output variables to automake. The description for this commit explains why performing this work ourselves is redundant; these variables will already be provided to automake thanks to pkg.m4. This can be confirmed by looking at Lines 141 and 142 of the pkg.m4 source code. As such, it is ok to remove what is being removed in this commit.

Should we do this? I think it is great not to redo unnecessary work when it is unnecessary. As such, this PR is a nice simplification. @laanwj brings up a good point that this is kind of buried, and you need to dig through the source code to confirm this. Luckily the pkg.m4 source code is not too large, and it’s easy to refer to. In this case, I’d say it’s not a big deal. But, I will defer to our build experts.

fanquake commented at 1:42 am on August 11, 2021: member

If we look at the pkg.m4 source code, Lines 141 and 142 of the pkg.m4 source code.

Not sure if you’re aware, but https://github.com/pkgconf/pkgconf (which you’ve been linking to here), is not the same piece of software as https://www.freedesktop.org/wiki/Software/pkg-config/, which is what most builders would actually be using.

jarolrod commented at 1:47 am on August 11, 2021: member

@fanquake ah thanks for the clarification. Just trying to learn about our build system by reviewing. I’ve checked the source code for the pkg-config you’ve linked and have found the same relevant lines in its pkg.m4

hebasto commented at 11:44 am on August 11, 2021: member

@jarolrod

… I want to confirm the reproducibility of the stripped information with the bitcoin-maintainer-tools/build-for-compare.py script, but I’m currently running into the following issue:

Try https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/108.

hebasto commented at 12:16 pm on August 11, 2021: member

Comparing the current master (c3545a7396787c1d649f2d12fcb380b714cab6b2) with pull/20201/merge using bitcoin-maintainer-tools/build-for-compare.py (with https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/108) returns zero diff.

hebasto commented at 12:42 pm on August 11, 2021: member

@jarolrod

Commit 388135b states that it is removing a redundant check of PKG_CHECK_MODULES. If we look at the pkg.m4 source code, and specifically lines 131-142, we can see that performing this check within our configure.ac script is in fact redundant.

See the update PR description.

hebasto commented at 12:47 pm on August 11, 2021: member

If we look at the pkg.m4 source code, Lines 141 and 142 of the pkg.m4 source code.

Not sure if you’re aware, but https://github.com/pkgconf/pkgconf (which you’ve been linking to here), is not the same piece of software as https://www.freedesktop.org/wiki/Software/pkg-config/, which is what most builders would actually be using.

The correct reference is here:

0AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
1AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl

hebasto force-pushed on Aug 11, 2021

hebasto commented at 12:52 pm on August 11, 2021: member

Rebased ab1feadf4e6cd4f5f2c7e74cea1c7baad61458ba -> 17c2cad948855f8f08e798b3e11b2be5e5fffdf1 (pr20201.03 -> pr20201.04) on top of the recent change in the build system (including Guix) and CI.

hebasto commented at 2:28 pm on August 11, 2021: member

Guix hashes:

 0$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 13eac41c46efef01623ad8b7511eb5368f57415a45dd1d6a435c257bd41839446  guix-build-17c2cad94885/output/aarch64-linux-gnu/SHA256SUMS.part
 2f00e74b71820778b361c2eeea7012bc61280d48e72e892bab554304df408fd5e  guix-build-17c2cad94885/output/aarch64-linux-gnu/bitcoin-17c2cad94885-aarch64-linux-gnu-debug.tar.gz
 36f9c90a2fdc0b850dfecefdd26d1f8a2c574e53d20ff35e64b02c861f50543fb  guix-build-17c2cad94885/output/aarch64-linux-gnu/bitcoin-17c2cad94885-aarch64-linux-gnu.tar.gz
 40d905e68421d77e0cea2d6586271a515a8e4f88fc69de8c0ff0b9dad65a25b6c  guix-build-17c2cad94885/output/arm-linux-gnueabihf/SHA256SUMS.part
 5cd0f03d2c14a5775dbb945d64aaaa0e9ecc1679f75ba74dcf30213daedcae2ac  guix-build-17c2cad94885/output/arm-linux-gnueabihf/bitcoin-17c2cad94885-arm-linux-gnueabihf-debug.tar.gz
 66def410f1881d53ae674ba64bc6d5e8a059b5e4b5816034b6268a248b8eb2a85  guix-build-17c2cad94885/output/arm-linux-gnueabihf/bitcoin-17c2cad94885-arm-linux-gnueabihf.tar.gz
 7485f20c1e7b4be427c75d580cbeb42a9d8ae5c40c1c16f75190f2be5fc0f1669  guix-build-17c2cad94885/output/dist-archive/bitcoin-17c2cad94885.tar.gz
 8a9bd07a042d1e74f65fc6c42dbc84672adcb6b520601754395e216b374933116  guix-build-17c2cad94885/output/powerpc64-linux-gnu/SHA256SUMS.part
 9582f31bd11a872c0b7d9be26b623a5a595a1373e6848f690322b3d3a944f167e  guix-build-17c2cad94885/output/powerpc64-linux-gnu/bitcoin-17c2cad94885-powerpc64-linux-gnu-debug.tar.gz
103bce6480c68e1e5214f5b9c2f306a489b5da469dd8474188b22322af0a53061b  guix-build-17c2cad94885/output/powerpc64-linux-gnu/bitcoin-17c2cad94885-powerpc64-linux-gnu.tar.gz
11d55af904cb36592db6305d643e7508252610ce334b455ee3a63454767d7166b9  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/SHA256SUMS.part
12f660af2150242f7658d5c642aadd15e2c71a8f5d989cf066558be1866b274123  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/bitcoin-17c2cad94885-powerpc64le-linux-gnu-debug.tar.gz
13f9f1a7cdd8f75297340c6da6d38a239c5acc56216fa057a69fe46526b23ac33d  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/bitcoin-17c2cad94885-powerpc64le-linux-gnu.tar.gz
141788779b44122b2e26f2536f2d1b61ae7c22490eda22cbdbc3260a4dd79a655c  guix-build-17c2cad94885/output/riscv64-linux-gnu/SHA256SUMS.part
154ea6204af91392715f6cb398512e64a481b985b107c999af505851b277df4c7e  guix-build-17c2cad94885/output/riscv64-linux-gnu/bitcoin-17c2cad94885-riscv64-linux-gnu-debug.tar.gz
1677f22f43b38d97466d7179028714a09f677cec301250ed534cd11998c9a29b1e  guix-build-17c2cad94885/output/riscv64-linux-gnu/bitcoin-17c2cad94885-riscv64-linux-gnu.tar.gz
171ebd0b23b401b309cbfd72d40e32da74ecffe8c77f83c08af74b46d644f59254  guix-build-17c2cad94885/output/x86_64-apple-darwin18/SHA256SUMS.part
18918df7b7a9584cbebdca691c2cb6e717e18e41c4a7c6beb85c3680d86a016945  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx-unsigned.dmg
195bbdb688ec9bd3366879c8cfaba24a2348a6535d25b16f11441c4b32af4e169d  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx-unsigned.tar.gz
20a8205ff6c618d3bb6c0ac88570b50ba3c845f2bfa1131740bbc435afb3a1d089  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx64.tar.gz
21ec78d91ed8a7b927ee9be14743a7f612c1baf62cfcd576c3fc8dfc593e765dd5  guix-build-17c2cad94885/output/x86_64-linux-gnu/SHA256SUMS.part
2258100846b217a1954d27ee39c8a33b544a831e983e1cf6e6e73cdc5304e68421  guix-build-17c2cad94885/output/x86_64-linux-gnu/bitcoin-17c2cad94885-x86_64-linux-gnu-debug.tar.gz
236983d9eecf01bbcec1ef59c0c5d63755f97e9d1900951c855ed0071a72efc1d7  guix-build-17c2cad94885/output/x86_64-linux-gnu/bitcoin-17c2cad94885-x86_64-linux-gnu.tar.gz
24d442887bf09591a2225903b66477cdbbe56314ed93e2a45a8b44168502cd9b27  guix-build-17c2cad94885/output/x86_64-w64-mingw32/SHA256SUMS.part
25035d6caf2ae753f2cb16ec1346239c05849eb2927162073652c73bfb82e4edcf  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win-unsigned.tar.gz
2602df13c02c0c8f11de912d9d4325540ee62085e1eb511c771b95d661950b281e  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64-debug.zip
27469209f47641ab15d5ae691ce7f3793d5d8d0584e01bba574a45de475f01a7e5  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64-setup-unsigned.exe
28327a246294ad0deb0c6fc24312ed11ca6396804d3d1856de679bb589946c3f93  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64.zip

jarolrod commented at 11:30 pm on August 19, 2021: member

GUIX hashes, mine match @hebasto

 0find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 1
 23eac41c46efef01623ad8b7511eb5368f57415a45dd1d6a435c257bd41839446  guix-build-17c2cad94885/output/aarch64-linux-gnu/SHA256SUMS.part
 3f00e74b71820778b361c2eeea7012bc61280d48e72e892bab554304df408fd5e  guix-build-17c2cad94885/output/aarch64-linux-gnu/bitcoin-17c2cad94885-aarch64-linux-gnu-debug.tar.gz
 46f9c90a2fdc0b850dfecefdd26d1f8a2c574e53d20ff35e64b02c861f50543fb  guix-build-17c2cad94885/output/aarch64-linux-gnu/bitcoin-17c2cad94885-aarch64-linux-gnu.tar.gz
 50d905e68421d77e0cea2d6586271a515a8e4f88fc69de8c0ff0b9dad65a25b6c  guix-build-17c2cad94885/output/arm-linux-gnueabihf/SHA256SUMS.part
 6cd0f03d2c14a5775dbb945d64aaaa0e9ecc1679f75ba74dcf30213daedcae2ac  guix-build-17c2cad94885/output/arm-linux-gnueabihf/bitcoin-17c2cad94885-arm-linux-gnueabihf-debug.tar.gz
 76def410f1881d53ae674ba64bc6d5e8a059b5e4b5816034b6268a248b8eb2a85  guix-build-17c2cad94885/output/arm-linux-gnueabihf/bitcoin-17c2cad94885-arm-linux-gnueabihf.tar.gz
 8485f20c1e7b4be427c75d580cbeb42a9d8ae5c40c1c16f75190f2be5fc0f1669  guix-build-17c2cad94885/output/dist-archive/bitcoin-17c2cad94885.tar.gz
 9a9bd07a042d1e74f65fc6c42dbc84672adcb6b520601754395e216b374933116  guix-build-17c2cad94885/output/powerpc64-linux-gnu/SHA256SUMS.part
10582f31bd11a872c0b7d9be26b623a5a595a1373e6848f690322b3d3a944f167e  guix-build-17c2cad94885/output/powerpc64-linux-gnu/bitcoin-17c2cad94885-powerpc64-linux-gnu-debug.tar.gz
113bce6480c68e1e5214f5b9c2f306a489b5da469dd8474188b22322af0a53061b  guix-build-17c2cad94885/output/powerpc64-linux-gnu/bitcoin-17c2cad94885-powerpc64-linux-gnu.tar.gz
12d55af904cb36592db6305d643e7508252610ce334b455ee3a63454767d7166b9  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/SHA256SUMS.part
13f660af2150242f7658d5c642aadd15e2c71a8f5d989cf066558be1866b274123  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/bitcoin-17c2cad94885-powerpc64le-linux-gnu-debug.tar.gz
14f9f1a7cdd8f75297340c6da6d38a239c5acc56216fa057a69fe46526b23ac33d  guix-build-17c2cad94885/output/powerpc64le-linux-gnu/bitcoin-17c2cad94885-powerpc64le-linux-gnu.tar.gz
151788779b44122b2e26f2536f2d1b61ae7c22490eda22cbdbc3260a4dd79a655c  guix-build-17c2cad94885/output/riscv64-linux-gnu/SHA256SUMS.part
164ea6204af91392715f6cb398512e64a481b985b107c999af505851b277df4c7e  guix-build-17c2cad94885/output/riscv64-linux-gnu/bitcoin-17c2cad94885-riscv64-linux-gnu-debug.tar.gz
1777f22f43b38d97466d7179028714a09f677cec301250ed534cd11998c9a29b1e  guix-build-17c2cad94885/output/riscv64-linux-gnu/bitcoin-17c2cad94885-riscv64-linux-gnu.tar.gz
181ebd0b23b401b309cbfd72d40e32da74ecffe8c77f83c08af74b46d644f59254  guix-build-17c2cad94885/output/x86_64-apple-darwin18/SHA256SUMS.part
19918df7b7a9584cbebdca691c2cb6e717e18e41c4a7c6beb85c3680d86a016945  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx-unsigned.dmg
205bbdb688ec9bd3366879c8cfaba24a2348a6535d25b16f11441c4b32af4e169d  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx-unsigned.tar.gz
21a8205ff6c618d3bb6c0ac88570b50ba3c845f2bfa1131740bbc435afb3a1d089  guix-build-17c2cad94885/output/x86_64-apple-darwin18/bitcoin-17c2cad94885-osx64.tar.gz
22ec78d91ed8a7b927ee9be14743a7f612c1baf62cfcd576c3fc8dfc593e765dd5  guix-build-17c2cad94885/output/x86_64-linux-gnu/SHA256SUMS.part
2358100846b217a1954d27ee39c8a33b544a831e983e1cf6e6e73cdc5304e68421  guix-build-17c2cad94885/output/x86_64-linux-gnu/bitcoin-17c2cad94885-x86_64-linux-gnu-debug.tar.gz
246983d9eecf01bbcec1ef59c0c5d63755f97e9d1900951c855ed0071a72efc1d7  guix-build-17c2cad94885/output/x86_64-linux-gnu/bitcoin-17c2cad94885-x86_64-linux-gnu.tar.gz
25d442887bf09591a2225903b66477cdbbe56314ed93e2a45a8b44168502cd9b27  guix-build-17c2cad94885/output/x86_64-w64-mingw32/SHA256SUMS.part
26035d6caf2ae753f2cb16ec1346239c05849eb2927162073652c73bfb82e4edcf  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win-unsigned.tar.gz
2702df13c02c0c8f11de912d9d4325540ee62085e1eb511c771b95d661950b281e  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64-debug.zip
28469209f47641ab15d5ae691ce7f3793d5d8d0584e01bba574a45de475f01a7e5  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64-setup-unsigned.exe
29327a246294ad0deb0c6fc24312ed11ca6396804d3d1856de679bb589946c3f93  guix-build-17c2cad94885/output/x86_64-w64-mingw32/bitcoin-17c2cad94885-win64.zip

jarolrod commented at 2:54 am on August 20, 2021: member

ACK 17c2cad948855f8f08e798b3e11b2be5e5fffdf1

As I’ve outlined here and here, this change is ok to do.

cannot ACK yet because I want to confirm the reproducibility of the stripped information

I have used the bitcoin-maintainer-tools/build-for-compare.py script to check for the reproducibility of the stripped information. The two branch heads tested were 17c2cad and c3545a7 and the built executables were bitcoind and bitcoin-qt. Running git diff -W --word-diff /tmp/compare/17c2cad /tmp/compare/c3545a7 returns a zero-diff.

shasums of the stripped info:

093c4fe1e65dffc43380d638f2fc72d8967bd6813b175d6363cfc46d27fcc5c24  /tmp/compare/bitcoind.17c2cad.stripped
193c4fe1e65dffc43380d638f2fc72d8967bd6813b175d6363cfc46d27fcc5c24  /tmp/compare/bitcoind.c3545a7.stripped
252e8e1375b7ea0e733c9e33eafd07c2f96731f96bebc65b72b2d156ac1faa37f  /tmp/compare/bitcoin-qt.17c2cad.stripped
352e8e1375b7ea0e733c9e33eafd07c2f96731f96bebc65b72b2d156ac1faa37f  /tmp/compare/bitcoin-qt.c3545a7.stripped

DrahtBot added the label Needs rebase on Oct 20, 2021

hebasto force-pushed on Oct 20, 2021

hebasto commented at 6:45 pm on October 20, 2021: member

Rebased 17c2cad948855f8f08e798b3e11b2be5e5fffdf1 -> 362edc2aebc2de41c55248521e446f0d1cb24498 (pr20201.04 -> pr20201.05) due to the conflict with #22646.

DrahtBot removed the label Needs rebase on Oct 20, 2021

hebasto commented at 6:15 am on October 21, 2021: member

Guix builds:

 0$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 1a2a40775cceebe46119187b6813751b26f994c61da769d6af8b0b770577f347f  guix-build-362edc2aebc2/output/aarch64-linux-gnu/SHA256SUMS.part
 29423bfa83362b47e72e2eccfa213ae4e748fad1b0d45f71c09714093bf693603  guix-build-362edc2aebc2/output/aarch64-linux-gnu/bitcoin-362edc2aebc2-aarch64-linux-gnu-debug.tar.gz
 327c2278ff51c666a2eed3f530919baa3ed08020e61a4db7ab99035b09a188c8d  guix-build-362edc2aebc2/output/aarch64-linux-gnu/bitcoin-362edc2aebc2-aarch64-linux-gnu.tar.gz
 4b1ac8183bf7bb566db73d1d5164bc43efe8623b3f143c6881a447b16fd0457f6  guix-build-362edc2aebc2/output/arm-linux-gnueabihf/SHA256SUMS.part
 5f2e0b51717d893ab141ac101b14000b0195c910802b89305551e9b80467c17a0  guix-build-362edc2aebc2/output/arm-linux-gnueabihf/bitcoin-362edc2aebc2-arm-linux-gnueabihf-debug.tar.gz
 6df7271778d5cca8f9ca622095654fc6bde36d11585e5f7519dec2e5c49a61fc4  guix-build-362edc2aebc2/output/arm-linux-gnueabihf/bitcoin-362edc2aebc2-arm-linux-gnueabihf.tar.gz
 744e6d43db6ed45fd7ce44bbba395d560649844d082289f174e1f55f931213a9f  guix-build-362edc2aebc2/output/dist-archive/bitcoin-362edc2aebc2.tar.gz
 85fc9adae2bee80488c6694380c12ecb7bf84a2eb59ce8690afce834ead638ccc  guix-build-362edc2aebc2/output/powerpc64-linux-gnu/SHA256SUMS.part
 9d509e514664eb0efb7a35278bd2ac49869dff287dc5fdc6cd9dd098b7b57183b  guix-build-362edc2aebc2/output/powerpc64-linux-gnu/bitcoin-362edc2aebc2-powerpc64-linux-gnu-debug.tar.gz
1087b88f97d75e6bd939e57ae92687bdef38f6ed89a4a95d16583ad25588888505  guix-build-362edc2aebc2/output/powerpc64-linux-gnu/bitcoin-362edc2aebc2-powerpc64-linux-gnu.tar.gz
11b5812cb9b71c86bd45def744a127f6d374f94025b31bd7472955172871a5d88a  guix-build-362edc2aebc2/output/powerpc64le-linux-gnu/SHA256SUMS.part
12468900c1b0d9941db683102a23d325c628c1f9b95cea3ece52984b7ffde8ad73  guix-build-362edc2aebc2/output/powerpc64le-linux-gnu/bitcoin-362edc2aebc2-powerpc64le-linux-gnu-debug.tar.gz
13ebdadcbd35af30698e471bb4a3e22c31cc7f349d2f707aaa4af5f50a47fb0cbf  guix-build-362edc2aebc2/output/powerpc64le-linux-gnu/bitcoin-362edc2aebc2-powerpc64le-linux-gnu.tar.gz
146ddc5a395321b8405b0478e68dab4e277d9cbda30acfeeea679f98e097d0c570  guix-build-362edc2aebc2/output/riscv64-linux-gnu/SHA256SUMS.part
15c579161a5a0d5c38c030141616dff9008918122c0ef7d9577ba9d6a6d28ab55a  guix-build-362edc2aebc2/output/riscv64-linux-gnu/bitcoin-362edc2aebc2-riscv64-linux-gnu-debug.tar.gz
16a76d043d38857bbbe822f81fcadf8e8e17e27e2d17a05ff5a27332f91de8b667  guix-build-362edc2aebc2/output/riscv64-linux-gnu/bitcoin-362edc2aebc2-riscv64-linux-gnu.tar.gz
174ba0548174a163a8ff0c2f514f08e7afaeb34221610aea040cbc3677cceb430d  guix-build-362edc2aebc2/output/x86_64-apple-darwin19/SHA256SUMS.part
186ca9e6db3d86f74745b4f07037fd1150418afd6bb51d738f82c79684d10e1b15  guix-build-362edc2aebc2/output/x86_64-apple-darwin19/bitcoin-362edc2aebc2-osx-unsigned.dmg
196e1b129645035e0cdac65dc494c1099fd8ea29da3e3bb8aab2d036616be00d8d  guix-build-362edc2aebc2/output/x86_64-apple-darwin19/bitcoin-362edc2aebc2-osx-unsigned.tar.gz
2029605019609ddebc7f1c690d3bbc6e7a89f0dfa5d1213d3986b87b281b0487ea  guix-build-362edc2aebc2/output/x86_64-apple-darwin19/bitcoin-362edc2aebc2-osx64.tar.gz
215b37027f95f67dcd28ea5bee8d04963845ca01585ab1897ae828b3ef564f24ab  guix-build-362edc2aebc2/output/x86_64-linux-gnu/SHA256SUMS.part
220cbb473fe3fecd456ad1773cb1ef15ceb88385cb3393f948d2e21be150edacb0  guix-build-362edc2aebc2/output/x86_64-linux-gnu/bitcoin-362edc2aebc2-x86_64-linux-gnu-debug.tar.gz
234c763aaf81895243002ea766253ff788440cc9fefae8817042fdccada9847db2  guix-build-362edc2aebc2/output/x86_64-linux-gnu/bitcoin-362edc2aebc2-x86_64-linux-gnu.tar.gz
24cb25c1f0ada443fe553206e3c0b1f2b8409a5a2575129df8e363be50770db6ea  guix-build-362edc2aebc2/output/x86_64-w64-mingw32/SHA256SUMS.part
25a62ab4d5ad3ae26e10c852717127cde9939abeeb19f4817fee0a80964f866610  guix-build-362edc2aebc2/output/x86_64-w64-mingw32/bitcoin-362edc2aebc2-win-unsigned.tar.gz
26b7f9c52f795123a8702c8b284284a95fc41e7479904989dd7cc7e32fdc83278d  guix-build-362edc2aebc2/output/x86_64-w64-mingw32/bitcoin-362edc2aebc2-win64-debug.zip
271d24991fc59b9681159447e389ed29c86780360946acd79d4c6b7678d7cca042  guix-build-362edc2aebc2/output/x86_64-w64-mingw32/bitcoin-362edc2aebc2-win64-setup-unsigned.exe
286864c944fdab6bc3f06f79a4db7d138821c15a0e3a589e8973bb626713362b7c  guix-build-362edc2aebc2/output/x86_64-w64-mingw32/bitcoin-362edc2aebc2-win64.zip

DrahtBot added the label Needs rebase on Dec 7, 2021

build: Drop redundant check of PKG_CHECK_MODULES presence 9049812106

build: Drop redundant AC_SUBST macros

Variables that are declared with AC_ARG_VAR macro are substituted via
AC_SUBST macro.
PKG_CHECK_MODULES macro already has AC_ARG_VAR(${PACKAGE}_CFLAGS) and
AC_ARG_VAR(${PACKAGE}_LIBS).

c236f2e228

hebasto force-pushed on Dec 29, 2021

hebasto commented at 9:17 pm on December 29, 2021: member

Rebased 362edc2aebc2de41c55248521e446f0d1cb24498 -> c236f2e22868c7653441660fd50863f5fa36a512 (pr20201.05 -> pr20201.06) due to the conflict with #23593.

DrahtBot removed the label Needs rebase on Dec 29, 2021

fanquake approved

fanquake commented at 3:07 am on December 30, 2021: member

ACK c236f2e22868c7653441660fd50863f5fa36a512 - I see no difference in config.logs.

90498121063c9a9b5e15144bf8959044adac3885 is obviously correct.

For c236f2e22868c7653441660fd50863f5fa36a512: The only calls left to AC_SUBST(*_LIBS) are for BOOST_LIBS, QT_LIBS, MINIUPNPC_LIBS and NATPMP_LIBS, which are required as we either modify these vars ourselves, or the dependency doesn’t use pkg-config.

fanquake merged this on Dec 30, 2021

fanquake closed this on Dec 30, 2021

sidhujag referenced this in commit 99b0620cd2 on Dec 30, 2021

hebasto deleted the branch on Dec 30, 2021

DrahtBot locked this on Dec 30, 2022

build: pkg-config related cleanup #20201

Conflicts

Gitian builds

Guix builds

Guix hashes:

Guix builds: