build, qt: Ditch `no_sdk_version_check.patch` #23618

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:211128-sdk changing 2 files +2 −22

hebasto commented at 7:01 PM on November 28, 2021: member

Since Qt 5.12.2 (see https://github.com/qt/qtbase/commit/5d181961ea28da07128384aa5144c67d07f87a3e) it is possible to control whether to check macOS SDK with the QT_MAC_SDK_NO_VERSION_CHECK variable.
build, qt: Ditch `no_sdk_version_check.patch` 855bd75503
hebasto added the label macOS on Nov 28, 2021
hebasto added the label Build system on Nov 28, 2021

hebasto commented at 9:59 PM on November 28, 2021: member

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
36f281510c304654055867902560a2152ff762c842f445f86ed8647ce2092fa2  guix-build-855bd7550368/output/aarch64-linux-gnu/SHA256SUMS.part
e7a9699c9c76bcd345d68dee11d162eb37781d02c17e090df076d36e46640f65  guix-build-855bd7550368/output/aarch64-linux-gnu/bitcoin-855bd7550368-aarch64-linux-gnu-debug.tar.gz
17cee558d3016337c92c7132819c8a61d7948d6e34cb419992650290f96bfd73  guix-build-855bd7550368/output/aarch64-linux-gnu/bitcoin-855bd7550368-aarch64-linux-gnu.tar.gz
010819764c2ab36083f3dc50e7160069cf0371124cd7117b9c25b0a0e4be7793  guix-build-855bd7550368/output/arm-linux-gnueabihf/SHA256SUMS.part
2bcaebd7c56b72e99e9a6410022775a33e60b9a9cc3a5820191f2fc2fdede68e  guix-build-855bd7550368/output/arm-linux-gnueabihf/bitcoin-855bd7550368-arm-linux-gnueabihf-debug.tar.gz
24db0bbafe29367b1fe57091a6f14776a4313a149dfe669747bf0033ab572e6b  guix-build-855bd7550368/output/arm-linux-gnueabihf/bitcoin-855bd7550368-arm-linux-gnueabihf.tar.gz
4ed0b462afe254acdc7db038949742d7bffbb5ffc19ae9f559ff3423fcd9a0af  guix-build-855bd7550368/output/dist-archive/bitcoin-855bd7550368.tar.gz
13c6b0ead5ec413d8fbaaf8f48bf9868d17bd93a4a9c3cff6c26ed44901ddf8c  guix-build-855bd7550368/output/powerpc64-linux-gnu/SHA256SUMS.part
44ca9853ae1af14019c08c800d2d23365cdbd1a4314427e06046d3471f4cafda  guix-build-855bd7550368/output/powerpc64-linux-gnu/bitcoin-855bd7550368-powerpc64-linux-gnu-debug.tar.gz
8d1ffe1fcd8064ef57802278491f494f33ca0c6f6f56fab87687ff37d7386c4c  guix-build-855bd7550368/output/powerpc64-linux-gnu/bitcoin-855bd7550368-powerpc64-linux-gnu.tar.gz
06215448287b0ba2d037c4546999a9e8ec43a06a1a6b6b53d3a303bc370e84a0  guix-build-855bd7550368/output/powerpc64le-linux-gnu/SHA256SUMS.part
c77814727e558f5a0ac788c7d616f058f42f06686219c1b091a3e82b22a221d5  guix-build-855bd7550368/output/powerpc64le-linux-gnu/bitcoin-855bd7550368-powerpc64le-linux-gnu-debug.tar.gz
be1a5b5b752c61e9814f7e29c36f45ab07f56baf4ef9e3df603d15541e954eea  guix-build-855bd7550368/output/powerpc64le-linux-gnu/bitcoin-855bd7550368-powerpc64le-linux-gnu.tar.gz
0da0bb2bc0e5f6221fb7892b3e6a4398b79e14513b768351fa461be7705ac29d  guix-build-855bd7550368/output/riscv64-linux-gnu/SHA256SUMS.part
c6fc741e1479885bde6889fd41474bc89d31382c92162910ad9c34c414162db9  guix-build-855bd7550368/output/riscv64-linux-gnu/bitcoin-855bd7550368-riscv64-linux-gnu-debug.tar.gz
675ce098e1223602c7d235739c0f9554f5c45b0f8332d87c6d3fe39487533f5f  guix-build-855bd7550368/output/riscv64-linux-gnu/bitcoin-855bd7550368-riscv64-linux-gnu.tar.gz
098a7596cc6eaf825e71e2cb20cc9b696f2527c6c6dfbe0a2a4b66cc551e8b98  guix-build-855bd7550368/output/x86_64-apple-darwin19/SHA256SUMS.part
0d671680721a03bb343839990537bbfc801de4537f546f81f19eb0f4d9a933e1  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx-unsigned.dmg
35e2ba3005df6c75e25a9b720a6444da46bf67d883432bc1df31250d604345bf  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx-unsigned.tar.gz
c9730e5c9ed042ecb8af79382e4281457bf62a0cd43832b7f2eeb8b61af637c5  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx64.tar.gz
24c9e4f0427ab3305e8cf4e6fb938804c9328b355170eebef3060547debd9816  guix-build-855bd7550368/output/x86_64-linux-gnu/SHA256SUMS.part
b54057ba38dc21e48214455a95ced69856f33c9d0419871b0d90b313fa641290  guix-build-855bd7550368/output/x86_64-linux-gnu/bitcoin-855bd7550368-x86_64-linux-gnu-debug.tar.gz
bb415289196f76c5c84788bab5de336caf15105f1074ea81125aa9cf4830ed88  guix-build-855bd7550368/output/x86_64-linux-gnu/bitcoin-855bd7550368-x86_64-linux-gnu.tar.gz
f1535e311e70c8fe8d6f9e6151917fe652c8cfa564798f10fa74d5c7f6c2016e  guix-build-855bd7550368/output/x86_64-w64-mingw32/SHA256SUMS.part
e1602b0d287d223418e6065fb9c624e98f5b8d725c02ed04fe798438c68c6ab7  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win-unsigned.tar.gz
5d95e5bd01bfaabc27afe2553e71b7719152043483e431c4fc684af65819a98b  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64-debug.zip
7e9ff466c78f29d7caf16d34d3faf70ea5262541b56ab2ef123d8758a268fe90  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64-setup-unsigned.exe
624a1e8f78418589e5f21eb327ac9caee948b6b41131353e3adcd11a74d3f102  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64.zip

DrahtBot commented at 1:38 AM on November 29, 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:
- #23489 (build: Qt 5.15.2 by fanquake)
- #22555 (build: Fix make apk for Android w/ non-default SOURCES_PATH in depends by hebasto)
- #22552 (build: Improve depends build system robustness by hebasto)
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 approved

fanquake commented at 8:50 AM on November 30, 2021: member

ACK 855bd7550368f9dc64eaed85fe0a345b83f01613

real	125m6.051s
user	630m53.259s
sys	42m20.482s
bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
36f281510c304654055867902560a2152ff762c842f445f86ed8647ce2092fa2  guix-build-855bd7550368/output/aarch64-linux-gnu/SHA256SUMS.part
e7a9699c9c76bcd345d68dee11d162eb37781d02c17e090df076d36e46640f65  guix-build-855bd7550368/output/aarch64-linux-gnu/bitcoin-855bd7550368-aarch64-linux-gnu-debug.tar.gz
17cee558d3016337c92c7132819c8a61d7948d6e34cb419992650290f96bfd73  guix-build-855bd7550368/output/aarch64-linux-gnu/bitcoin-855bd7550368-aarch64-linux-gnu.tar.gz
010819764c2ab36083f3dc50e7160069cf0371124cd7117b9c25b0a0e4be7793  guix-build-855bd7550368/output/arm-linux-gnueabihf/SHA256SUMS.part
2bcaebd7c56b72e99e9a6410022775a33e60b9a9cc3a5820191f2fc2fdede68e  guix-build-855bd7550368/output/arm-linux-gnueabihf/bitcoin-855bd7550368-arm-linux-gnueabihf-debug.tar.gz
24db0bbafe29367b1fe57091a6f14776a4313a149dfe669747bf0033ab572e6b  guix-build-855bd7550368/output/arm-linux-gnueabihf/bitcoin-855bd7550368-arm-linux-gnueabihf.tar.gz
4ed0b462afe254acdc7db038949742d7bffbb5ffc19ae9f559ff3423fcd9a0af  guix-build-855bd7550368/output/dist-archive/bitcoin-855bd7550368.tar.gz
13c6b0ead5ec413d8fbaaf8f48bf9868d17bd93a4a9c3cff6c26ed44901ddf8c  guix-build-855bd7550368/output/powerpc64-linux-gnu/SHA256SUMS.part
44ca9853ae1af14019c08c800d2d23365cdbd1a4314427e06046d3471f4cafda  guix-build-855bd7550368/output/powerpc64-linux-gnu/bitcoin-855bd7550368-powerpc64-linux-gnu-debug.tar.gz
8d1ffe1fcd8064ef57802278491f494f33ca0c6f6f56fab87687ff37d7386c4c  guix-build-855bd7550368/output/powerpc64-linux-gnu/bitcoin-855bd7550368-powerpc64-linux-gnu.tar.gz
06215448287b0ba2d037c4546999a9e8ec43a06a1a6b6b53d3a303bc370e84a0  guix-build-855bd7550368/output/powerpc64le-linux-gnu/SHA256SUMS.part
c77814727e558f5a0ac788c7d616f058f42f06686219c1b091a3e82b22a221d5  guix-build-855bd7550368/output/powerpc64le-linux-gnu/bitcoin-855bd7550368-powerpc64le-linux-gnu-debug.tar.gz
be1a5b5b752c61e9814f7e29c36f45ab07f56baf4ef9e3df603d15541e954eea  guix-build-855bd7550368/output/powerpc64le-linux-gnu/bitcoin-855bd7550368-powerpc64le-linux-gnu.tar.gz
0da0bb2bc0e5f6221fb7892b3e6a4398b79e14513b768351fa461be7705ac29d  guix-build-855bd7550368/output/riscv64-linux-gnu/SHA256SUMS.part
c6fc741e1479885bde6889fd41474bc89d31382c92162910ad9c34c414162db9  guix-build-855bd7550368/output/riscv64-linux-gnu/bitcoin-855bd7550368-riscv64-linux-gnu-debug.tar.gz
675ce098e1223602c7d235739c0f9554f5c45b0f8332d87c6d3fe39487533f5f  guix-build-855bd7550368/output/riscv64-linux-gnu/bitcoin-855bd7550368-riscv64-linux-gnu.tar.gz
098a7596cc6eaf825e71e2cb20cc9b696f2527c6c6dfbe0a2a4b66cc551e8b98  guix-build-855bd7550368/output/x86_64-apple-darwin19/SHA256SUMS.part
0d671680721a03bb343839990537bbfc801de4537f546f81f19eb0f4d9a933e1  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx-unsigned.dmg
35e2ba3005df6c75e25a9b720a6444da46bf67d883432bc1df31250d604345bf  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx-unsigned.tar.gz
c9730e5c9ed042ecb8af79382e4281457bf62a0cd43832b7f2eeb8b61af637c5  guix-build-855bd7550368/output/x86_64-apple-darwin19/bitcoin-855bd7550368-osx64.tar.gz
24c9e4f0427ab3305e8cf4e6fb938804c9328b355170eebef3060547debd9816  guix-build-855bd7550368/output/x86_64-linux-gnu/SHA256SUMS.part
b54057ba38dc21e48214455a95ced69856f33c9d0419871b0d90b313fa641290  guix-build-855bd7550368/output/x86_64-linux-gnu/bitcoin-855bd7550368-x86_64-linux-gnu-debug.tar.gz
bb415289196f76c5c84788bab5de336caf15105f1074ea81125aa9cf4830ed88  guix-build-855bd7550368/output/x86_64-linux-gnu/bitcoin-855bd7550368-x86_64-linux-gnu.tar.gz
f1535e311e70c8fe8d6f9e6151917fe652c8cfa564798f10fa74d5c7f6c2016e  guix-build-855bd7550368/output/x86_64-w64-mingw32/SHA256SUMS.part
e1602b0d287d223418e6065fb9c624e98f5b8d725c02ed04fe798438c68c6ab7  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win-unsigned.tar.gz
5d95e5bd01bfaabc27afe2553e71b7719152043483e431c4fc684af65819a98b  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64-debug.zip
7e9ff466c78f29d7caf16d34d3faf70ea5262541b56ab2ef123d8758a268fe90  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64-setup-unsigned.exe
624a1e8f78418589e5f21eb327ac9caee948b6b41131353e3adcd11a74d3f102  guix-build-855bd7550368/output/x86_64-w64-mingw32/bitcoin-855bd7550368-win64.zip

fanquake merged this on Nov 30, 2021
fanquake closed this on Nov 30, 2021
hebasto deleted the branch on Nov 30, 2021
sidhujag referenced this in commit 0601b089b5 on Nov 30, 2021
RandyMcMillan referenced this in commit 1e432b0276 on Dec 23, 2021
DrahtBot locked this on Nov 30, 2022

Contributors

Labels

build, qt: Ditch `no_sdk_version_check.patch` #23618

Guix builds:

Conflicts