From 105442f8cbffaf435cd4b685f7da4ca8b2be4633 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 16 May 2023 11:14:50 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#26422: build: Use newest `config.{guess,sub}` available ea7b8528490d330f0f4e34e9b26ab00ba528f546 build: Use newest `config.{guess,sub}` available (Hennadii Stepanov) Pull request description: Fixes cross-compiling on old systems. See https://github.com/bitcoin/bitcoin/issues/26420#issuecomment-1295886891. Guix builds: ``` ab58f8db4fb50c2af08be646e4a57491ff853bf41319fe3e962bb928ace2c1be guix-build-ea7b8528490d/output/aarch64-linux-gnu/SHA256SUMS.part c4a42a7dbfb15aa910ce269c3f3158df758eba01dd855cf6529c960d9b8bd76b guix-build-ea7b8528490d/output/aarch64-linux-gnu/bitcoin-ea7b8528490d-aarch64-linux-gnu-debug.tar.gz add5f80b0c8ee216c1d8db31e13656c45f11fe5c967324b8fcedd64d0d408938 guix-build-ea7b8528490d/output/aarch64-linux-gnu/bitcoin-ea7b8528490d-aarch64-linux-gnu.tar.gz ba807ae5b29aca611a35700a968a4f9010528d6cdb6412f98c707aa0e9510e8b guix-build-ea7b8528490d/output/arm-linux-gnueabihf/SHA256SUMS.part fe127eff1fc8389ef00ae39d1446640512120d2f247a2ee64c06290116265729 guix-build-ea7b8528490d/output/arm-linux-gnueabihf/bitcoin-ea7b8528490d-arm-linux-gnueabihf-debug.tar.gz ac75f0aba2e0801fc6b59405bff09884837e0ff8b6fa9fc1225e8325a4ec78a4 guix-build-ea7b8528490d/output/arm-linux-gnueabihf/bitcoin-ea7b8528490d-arm-linux-gnueabihf.tar.gz dee402db94829bd5ce029ca02d75e008f8a18a44fd88e8ecd00b3ce586f223f4 guix-build-ea7b8528490d/output/arm64-apple-darwin/SHA256SUMS.part bbf985dbd1ca875fbb0a03c21698d4b6797c27be45e3a31a3229daee0ecbcbf4 guix-build-ea7b8528490d/output/arm64-apple-darwin/bitcoin-ea7b8528490d-arm64-apple-darwin-unsigned.dmg 3cca89e532a2b637185ca316168b0f6fac2fce8795b486d530ee966a844716f1 guix-build-ea7b8528490d/output/arm64-apple-darwin/bitcoin-ea7b8528490d-arm64-apple-darwin-unsigned.tar.gz 487c68e1a71f6254d48f8d322a46c94e671e00b5930fbfe689804cd8e379c8e9 guix-build-ea7b8528490d/output/arm64-apple-darwin/bitcoin-ea7b8528490d-arm64-apple-darwin.tar.gz db663cf3216871f4c87b687a839cb5cf18b5d9906b74d4c19e8ad422d904aa87 guix-build-ea7b8528490d/output/dist-archive/bitcoin-ea7b8528490d.tar.gz 09121bcd36d72ad26364182c678f2edaaf5b5e635ed43a6964ad7e4be1335075 guix-build-ea7b8528490d/output/powerpc64-linux-gnu/SHA256SUMS.part e8638959b501c3d70421dcdc6579c5d77c5786abed7ad3d6051c628fd8f17c6b guix-build-ea7b8528490d/output/powerpc64-linux-gnu/bitcoin-ea7b8528490d-powerpc64-linux-gnu-debug.tar.gz b1aee39067d5010b4e63dc916232eb1582299d7acb56afacf5c9a5b75dcd8b82 guix-build-ea7b8528490d/output/powerpc64-linux-gnu/bitcoin-ea7b8528490d-powerpc64-linux-gnu.tar.gz 9ed3d0e710847068cb2064e51e3f4c14166ad86f5c297adcf0a4d24cd4e2a723 guix-build-ea7b8528490d/output/powerpc64le-linux-gnu/SHA256SUMS.part 19f99e41f41d9525a412872e61687452ab5ac23c5c964ef34b8c31a9d71adabc guix-build-ea7b8528490d/output/powerpc64le-linux-gnu/bitcoin-ea7b8528490d-powerpc64le-linux-gnu-debug.tar.gz bd669150ce6830ffbd8523acf75b6daf894c9449c6ce3073a9ce89156d9268f9 guix-build-ea7b8528490d/output/powerpc64le-linux-gnu/bitcoin-ea7b8528490d-powerpc64le-linux-gnu.tar.gz 5e42cb1fee7b5b046da37f62674a1662a6135f9644f5ea0288876334c3e8d34a guix-build-ea7b8528490d/output/riscv64-linux-gnu/SHA256SUMS.part 8767a84e04e0cd27318305d31a5a897cdc5f56d8505416dd01753bb35c8980b0 guix-build-ea7b8528490d/output/riscv64-linux-gnu/bitcoin-ea7b8528490d-riscv64-linux-gnu-debug.tar.gz 00f1abcc64a7010f194dab847c04481e10991128b919b513aa9eb2911d03a243 guix-build-ea7b8528490d/output/riscv64-linux-gnu/bitcoin-ea7b8528490d-riscv64-linux-gnu.tar.gz ae7add2e3ea0663fdd9d2c61c737e4bb4155d42932a0a5ce8cbbbcee627f01f3 guix-build-ea7b8528490d/output/x86_64-apple-darwin/SHA256SUMS.part ba6b4a2f6a97e382a10ffec605f025d8724ac2dc0a441dbb42be79e915e98738 guix-build-ea7b8528490d/output/x86_64-apple-darwin/bitcoin-ea7b8528490d-x86_64-apple-darwin-unsigned.dmg 67914f29d9e81ee50b340c3ac05b336b98766b59b8cce153493786b04a51f18a guix-build-ea7b8528490d/output/x86_64-apple-darwin/bitcoin-ea7b8528490d-x86_64-apple-darwin-unsigned.tar.gz 1d813d0e905a324f48beb2ce1da980e372c529b0eadb521662063f283fbc9bf6 guix-build-ea7b8528490d/output/x86_64-apple-darwin/bitcoin-ea7b8528490d-x86_64-apple-darwin.tar.gz 4e3d176ad9059e59e9b21919001ced2710c74229536b27ef65acef514287f7e5 guix-build-ea7b8528490d/output/x86_64-linux-gnu/SHA256SUMS.part cbe31f4a60aac1a72bcdedccf39c18da21a5a4e257e77c0832ad93ce722923dd guix-build-ea7b8528490d/output/x86_64-linux-gnu/bitcoin-ea7b8528490d-x86_64-linux-gnu-debug.tar.gz d5f3cf53adf1d964cded3461b66199c4917715af0d84cac78c97acc92432b059 guix-build-ea7b8528490d/output/x86_64-linux-gnu/bitcoin-ea7b8528490d-x86_64-linux-gnu.tar.gz 9b1877d00fd447222839615cfeb089a8237f1d5d80cd2b819dd66621df8f2375 guix-build-ea7b8528490d/output/x86_64-w64-mingw32/SHA256SUMS.part 2fb88e40dd399a2dedb1a44c5bd1091899b00a6d3b8d99149f622a0069205560 guix-build-ea7b8528490d/output/x86_64-w64-mingw32/bitcoin-ea7b8528490d-win64-debug.zip 074ce203494dc15c916c151426438f09982a270f389cd139d3f28a75aea51af8 guix-build-ea7b8528490d/output/x86_64-w64-mingw32/bitcoin-ea7b8528490d-win64-setup-unsigned.exe 2aa8ff735ce96580fb915757ccce79dc2a19afb043a6c93d3749023ca647666d guix-build-ea7b8528490d/output/x86_64-w64-mingw32/bitcoin-ea7b8528490d-win64-unsigned.tar.gz 0ac19e1901506c47d5b20297d468dbaa93e8572232671a16d08355988df8e7c3 guix-build-ea7b8528490d/output/x86_64-w64-mingw32/bitcoin-ea7b8528490d-win64.zip ``` ACKs for top commit: fanquake: ACK ea7b8528490d330f0f4e34e9b26ab00ba528f546 Tree-SHA512: 75c154d2195e2e8cf2e2786c08bc5096b07027715f559fc81c1ce221ce74c2732e745b74809d7c4a9f909a1018399a07329abd993e50ecec91dd95518fce0b39 --- autogen.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/autogen.sh b/autogen.sh index de16260b56..d0ac7ef7ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -14,3 +14,12 @@ fi command -v autoreconf >/dev/null || \ (echo "configuration failed, please install autoconf first" && exit 1) autoreconf --install --force --warnings=all + +if expr "'$(build-aux/config.guess --timestamp)" \< "'$(depends/config.guess --timestamp)" > /dev/null; then + cp depends/config.guess build-aux + cp depends/config.guess src/secp256k1/build-aux +fi +if expr "'$(build-aux/config.sub --timestamp)" \< "'$(depends/config.sub --timestamp)" > /dev/null; then + cp depends/config.sub build-aux + cp depends/config.sub src/secp256k1/build-aux +fi