build: use newer config.guess & config.sub in depends

fanquake commented at 7:09 am on July 22, 2021: member

Hebasto asked for these to be split out of #21851. Using the newer config.guess and config.sub is needed when wanting to cross-compile for newer targets, like arm64-apple-darwin. I did Guix builds for 5985f098eaa3f9eff0b2fd580a0ef51e8aebc4e0, and then added another commit for install_db4.sh, to use a smilar version to what we have in depends, although that isn’t used in Guix.

Guix builds for 5985f098eaa3f9eff0b2fd580a0ef51e8aebc4e0:

 05b1d280764cacefba42e8002cb6cdcdd353b4cd6f5b84f60505eca6a3814ea29  guix-build-5985f098eaa3/output/aarch64-linux-gnu/SHA256SUMS.part
 1a4bfcfc91cc7acaa7d1eb039c9715f930faef0def819eaf476a69976dc86f8c9  guix-build-5985f098eaa3/output/aarch64-linux-gnu/bitcoin-5985f098eaa3-aarch64-linux-gnu-debug.tar.gz
 2e8175aa11b7f46af364e40015de497c4585eb7307375bb4c1a9d8e94cd992359  guix-build-5985f098eaa3/output/aarch64-linux-gnu/bitcoin-5985f098eaa3-aarch64-linux-gnu.tar.gz
 32ec5d3d85979e7334c03761649655e1b384049d634be99d8e96e7d1e4dbca2e7  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/SHA256SUMS.part
 4ccb73b187cc91b65bd1f74a63019162ef1186a69e1f9e7415847e4a50b9df35f  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/bitcoin-5985f098eaa3-arm-linux-gnueabihf-debug.tar.gz
 58d645022560b46f109c6de0c1a320eed2e348300274f3a5fcc78c911ec6e4338  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/bitcoin-5985f098eaa3-arm-linux-gnueabihf.tar.gz
 6e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-5985f098eaa3/output/dist-archive/SKIPATTEST.TAG
 75189568f1db5539d955f762f0c15ff2a03f9551663239f3a25e2b9832b223081  guix-build-5985f098eaa3/output/dist-archive/bitcoin-5985f098eaa3.tar.gz
 8bd07c1ccb512501ed18498d2a7f7d3f9d370fdb624e34514a3acea7457d137e7  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/SHA256SUMS.part
 93f989fcb6dcccc82ebed9d316944ce2be2f75a4735a2cfb0d0298655f9491852  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/bitcoin-5985f098eaa3-powerpc64-linux-gnu-debug.tar.gz
1077badf255903a23cb60b8468c9c233da7253d866c47adc39e27c49a95640722f  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/bitcoin-5985f098eaa3-powerpc64-linux-gnu.tar.gz
1175d5481a909951055af8fb3812ec315d2aeaba6cc0d2310dde08b5cacfa27d75  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/SHA256SUMS.part
12bfb090300af5acee297f139df4a9163fed3a5715cddb1fd3fdf99b4922790a62  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/bitcoin-5985f098eaa3-powerpc64le-linux-gnu-debug.tar.gz
13d6e78a56cbb967840f881e630fe42d4add000dfb442e90120ca541a16caabb57  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/bitcoin-5985f098eaa3-powerpc64le-linux-gnu.tar.gz
14ccfee2f4cb1134356cd607a9f7687bd4f5cf4e4e1121fd98a32c9c74aad19110  guix-build-5985f098eaa3/output/riscv64-linux-gnu/SHA256SUMS.part
153cc9eb93c1143e565a68f57633c1932c84638ff40f3286ef59c3dddde514e97b  guix-build-5985f098eaa3/output/riscv64-linux-gnu/bitcoin-5985f098eaa3-riscv64-linux-gnu-debug.tar.gz
167d6d9c68afc29f39e2dce74fcb36555638c99cce5168d1daecd97e598ce5ac50  guix-build-5985f098eaa3/output/riscv64-linux-gnu/bitcoin-5985f098eaa3-riscv64-linux-gnu.tar.gz
173d3437db545b0ab0111bf0f017c589b136a68f77d7525ed17597a0482493fe5d  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/SHA256SUMS.part
180b51cf6a9338036a6f4505232a3b0eeb6265182261b588da8ed90ffc3bd702c7  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx-unsigned.dmg
192cb20c994777bc2e3747e8ed19209e98c614448f231c8906f4a99a93be9df5c9  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx-unsigned.tar.gz
2085fa4e6de567d515b36bd81edc28743507878fefb64c3ca3bb4509f0f9ffab88  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx64.tar.gz
2109ab1a4d1e8743fba66766b077ac3e0316a161e9aaf238de5d418a5d4ed0adde  guix-build-5985f098eaa3/output/x86_64-linux-gnu/SHA256SUMS.part
22eb18a31f088188fdd54e82c9cdb96751d271f67b4beba29dfb0c1ce2964b0e5c  guix-build-5985f098eaa3/output/x86_64-linux-gnu/bitcoin-5985f098eaa3-x86_64-linux-gnu-debug.tar.gz
2345b91caad1e09f80d43b0a577f210596214d08bdc795c4f9e191caa7c3f494b9  guix-build-5985f098eaa3/output/x86_64-linux-gnu/bitcoin-5985f098eaa3-x86_64-linux-gnu.tar.gz
2496c8a07bd58d5fe3b38a797cca254999646d6af102d3bdf2495c71f1c641f798  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/SHA256SUMS.part
25fe79ba07cd834f842ffa4e11cbea91f026e9f2cda2d05dde565d0da6caad61dd  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win-unsigned.tar.gz
2622d6a2c7b66b6a3d1693235c9ee3b3a3686c3417164a40bc6d83eefda533eb93  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64-debug.zip
27bdef5d3a7c6d9e180fbbb870ac210c26e53fcf73cced84297a0ee42339e3970f  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64-setup-unsigned.exe
28af24796889ebd671003a1e139a07b440bc28c97ab19bdd5ae9bd3d6fbfa2095a  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64.zip

depends: use latest config.guess and config.sub for libevent bda0b637b2

depends: use latest config.guess and config.sub for cctools 35d082c500

depends: use latest config.guess and config.sub for sqlite 5985f098ea

contrib: use newer config.guess & config.sub in install_db4.sh 9b9da92e2a

fanquake added the label Build system on Jul 22, 2021

MarcoFalke added the label DrahtBot Guix build requested on Jul 22, 2021

hebasto commented at 7:41 am on July 22, 2021: member

Concept ACK, this change is common for #21851 and #22487.

hebasto commented at 9:37 am on July 22, 2021: member

Guix builds for 5985f098eaa3f9eff0b2fd580a0ef51e8aebc4e0:

 0$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 15b1d280764cacefba42e8002cb6cdcdd353b4cd6f5b84f60505eca6a3814ea29  guix-build-5985f098eaa3/output/aarch64-linux-gnu/SHA256SUMS.part
 2a4bfcfc91cc7acaa7d1eb039c9715f930faef0def819eaf476a69976dc86f8c9  guix-build-5985f098eaa3/output/aarch64-linux-gnu/bitcoin-5985f098eaa3-aarch64-linux-gnu-debug.tar.gz
 3e8175aa11b7f46af364e40015de497c4585eb7307375bb4c1a9d8e94cd992359  guix-build-5985f098eaa3/output/aarch64-linux-gnu/bitcoin-5985f098eaa3-aarch64-linux-gnu.tar.gz
 42ec5d3d85979e7334c03761649655e1b384049d634be99d8e96e7d1e4dbca2e7  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/SHA256SUMS.part
 5ccb73b187cc91b65bd1f74a63019162ef1186a69e1f9e7415847e4a50b9df35f  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/bitcoin-5985f098eaa3-arm-linux-gnueabihf-debug.tar.gz
 68d645022560b46f109c6de0c1a320eed2e348300274f3a5fcc78c911ec6e4338  guix-build-5985f098eaa3/output/arm-linux-gnueabihf/bitcoin-5985f098eaa3-arm-linux-gnueabihf.tar.gz
 7e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-5985f098eaa3/output/dist-archive/SKIPATTEST.TAG
 85189568f1db5539d955f762f0c15ff2a03f9551663239f3a25e2b9832b223081  guix-build-5985f098eaa3/output/dist-archive/bitcoin-5985f098eaa3.tar.gz
 9bd07c1ccb512501ed18498d2a7f7d3f9d370fdb624e34514a3acea7457d137e7  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/SHA256SUMS.part
103f989fcb6dcccc82ebed9d316944ce2be2f75a4735a2cfb0d0298655f9491852  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/bitcoin-5985f098eaa3-powerpc64-linux-gnu-debug.tar.gz
1177badf255903a23cb60b8468c9c233da7253d866c47adc39e27c49a95640722f  guix-build-5985f098eaa3/output/powerpc64-linux-gnu/bitcoin-5985f098eaa3-powerpc64-linux-gnu.tar.gz
1275d5481a909951055af8fb3812ec315d2aeaba6cc0d2310dde08b5cacfa27d75  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/SHA256SUMS.part
13bfb090300af5acee297f139df4a9163fed3a5715cddb1fd3fdf99b4922790a62  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/bitcoin-5985f098eaa3-powerpc64le-linux-gnu-debug.tar.gz
14d6e78a56cbb967840f881e630fe42d4add000dfb442e90120ca541a16caabb57  guix-build-5985f098eaa3/output/powerpc64le-linux-gnu/bitcoin-5985f098eaa3-powerpc64le-linux-gnu.tar.gz
15ccfee2f4cb1134356cd607a9f7687bd4f5cf4e4e1121fd98a32c9c74aad19110  guix-build-5985f098eaa3/output/riscv64-linux-gnu/SHA256SUMS.part
163cc9eb93c1143e565a68f57633c1932c84638ff40f3286ef59c3dddde514e97b  guix-build-5985f098eaa3/output/riscv64-linux-gnu/bitcoin-5985f098eaa3-riscv64-linux-gnu-debug.tar.gz
177d6d9c68afc29f39e2dce74fcb36555638c99cce5168d1daecd97e598ce5ac50  guix-build-5985f098eaa3/output/riscv64-linux-gnu/bitcoin-5985f098eaa3-riscv64-linux-gnu.tar.gz
183d3437db545b0ab0111bf0f017c589b136a68f77d7525ed17597a0482493fe5d  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/SHA256SUMS.part
190b51cf6a9338036a6f4505232a3b0eeb6265182261b588da8ed90ffc3bd702c7  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx-unsigned.dmg
202cb20c994777bc2e3747e8ed19209e98c614448f231c8906f4a99a93be9df5c9  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx-unsigned.tar.gz
2185fa4e6de567d515b36bd81edc28743507878fefb64c3ca3bb4509f0f9ffab88  guix-build-5985f098eaa3/output/x86_64-apple-darwin18/bitcoin-5985f098eaa3-osx64.tar.gz
2209ab1a4d1e8743fba66766b077ac3e0316a161e9aaf238de5d418a5d4ed0adde  guix-build-5985f098eaa3/output/x86_64-linux-gnu/SHA256SUMS.part
23eb18a31f088188fdd54e82c9cdb96751d271f67b4beba29dfb0c1ce2964b0e5c  guix-build-5985f098eaa3/output/x86_64-linux-gnu/bitcoin-5985f098eaa3-x86_64-linux-gnu-debug.tar.gz
2445b91caad1e09f80d43b0a577f210596214d08bdc795c4f9e191caa7c3f494b9  guix-build-5985f098eaa3/output/x86_64-linux-gnu/bitcoin-5985f098eaa3-x86_64-linux-gnu.tar.gz
2596c8a07bd58d5fe3b38a797cca254999646d6af102d3bdf2495c71f1c641f798  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/SHA256SUMS.part
26fe79ba07cd834f842ffa4e11cbea91f026e9f2cda2d05dde565d0da6caad61dd  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win-unsigned.tar.gz
2722d6a2c7b66b6a3d1693235c9ee3b3a3686c3417164a40bc6d83eefda533eb93  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64-debug.zip
28bdef5d3a7c6d9e180fbbb870ac210c26e53fcf73cced84297a0ee42339e3970f  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64-setup-unsigned.exe
29af24796889ebd671003a1e139a07b440bc28c97ab19bdd5ae9bd3d6fbfa2095a  guix-build-5985f098eaa3/output/x86_64-w64-mingw32/bitcoin-5985f098eaa3-win64.zip

hebasto approved

hebasto commented at 12:49 pm on July 22, 2021: member

ACK 9b9da92e2a6c67e7df2b190bfd6a3fb58d794f0c

The first three commits tested in the contexts of #21851 and #22487. The last one tested on Linux Mint 20.2 (x86_64) with

0$ ./contrib/install_db4.sh $(pwd) --host=arm64-apple-darwin20

DrahtBot commented at 9:45 pm on July 22, 2021: 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:

#21778 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.

fanquake merged this on Jul 23, 2021

fanquake closed this on Jul 23, 2021

sidhujag referenced this in commit 64f8136fbf on Jul 23, 2021

DrahtBot commented at 11:56 pm on July 23, 2021: member

Guix builds

File	commit 36aee0f3538ec3399a3838041ea5993aba5f518b(master)	commit 62eb80c712115f2fa4ebde372f150ed08dbc9bab(master and this pull)
SHA256SUMS.part	`ee8f2fe0439aa065...`	`4281c0420c7357c7...`
SKIPATTEST.TAG	`e3b0c44298fc1c14...`	`e3b0c44298fc1c14...`
*-aarch64-linux-gnu-debug.tar.gz	`562dfed93e39da07...`	`484687c0dc1be6b2...`
*-aarch64-linux-gnu.tar.gz	`6f4112944cf81e33...`	`04ee43dabf28f4e3...`
*-arm-linux-gnueabihf-debug.tar.gz	`8f37daef2ac0bdec...`	`40b5cb62430fd359...`
*-arm-linux-gnueabihf.tar.gz	`2cb234fda6084d80...`	`f753af593024682a...`
*-osx-unsigned.dmg	`ae6190e1c9422ccc...`	`912643ba21a49d45...`
*-osx-unsigned.tar.gz	`20d9d3e908299ee1...`	`4bcaf6b09d0a64f4...`
*-osx64.tar.gz	`ab781ed522c81dad...`	`dd19b25d7d156808...`
*-powerpc64-linux-gnu-debug.tar.gz	`94dc3a358b093190...`	`4fe64e39df93dd01...`
*-powerpc64-linux-gnu.tar.gz	`be3ddea1275caec5...`	`4319ceed7038bd41...`
*-powerpc64le-linux-gnu-debug.tar.gz	`8b6559d4c3a13aea...`	`2b0f1741f6e64251...`
*-powerpc64le-linux-gnu.tar.gz	`07eee5b417dd60c2...`	`690c13f9f3004985...`
*-riscv64-linux-gnu-debug.tar.gz	`897e2b442724eda7...`	`f23ef325d46f39e5...`
*-riscv64-linux-gnu.tar.gz	`1ca2ee8b38397ce3...`	`8923167f97f87a67...`
*-win-unsigned.tar.gz	`9137ddedd3649f6d...`	`0bc1eefbd90e707f...`
*-win64-debug.zip	`cc652316d6a8c470...`	`262a3c92436188c2...`
*-win64-setup-unsigned.exe	`34309929018670ba...`	`c8d0d5c3f3eb5db3...`
*-win64.zip	`9252470a33cec985...`	`df894a2d0c9e16be...`
*-x86_64-linux-gnu-debug.tar.gz	`0ef500b68df2258e...`	`c55f8971f7fe2d71...`
*-x86_64-linux-gnu.tar.gz	`828f789f13e447bb...`	`b063d52411bf84a9...`
*.tar.gz	`756fc6a1bafc8081...`	`66faef54072b1de5...`
guix_build.log	`52af8deb0ec28951...`	`38df3f74800b05fc...`
guix_build.log.diff		`da649ff17c873518...`

DrahtBot removed the label DrahtBot Guix build requested on Jul 23, 2021

DrahtBot locked this on Aug 18, 2022

fanquake deleted the branch on Nov 9, 2022

build: use newer config.guess & config.sub in depends #22526

Conflicts

Guix builds