New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build, qt: Fix static builds on macOS Big Sur #21495
Conversation
Gitian builds:
Guix builds:
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
qt5.12 is only used in master, so assigned 22.0 milestone |
Concept ACK. This matches the change that was backported to the 5.12 branch ( Similar to other Qt patches we have, can you add a note at the top of the patch file, mentioning that this can be dropped when using Qt 5.12.11 or later. @jarolrod or @Sjors could either of you test a depends build and confirm that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirming that this fixes the depends build issue on macOS Big Sur. Thanks for the fix!
A ton of the following warnings do pop-up, but they are non-fatal. I also get them on Catalina with SDK 10.15.
ld: warning: direct access in function 'QMetaTypeIdQObject<QWindow*, 8>::qt_metatype_id()' from file '/Users/xyz/Code/Bitcoin/fix-bigsur-static/bitcoin/depends/x86_64-apple-darwin20.3.0/plugins/platforms/libqcocoa.a(qcocoaintegration.o)' to global weak symbol 'QMetaTypeIdQObject<QWindow*, 8>::qt_metatype_id()::metatype_id' from file 'qt/libbitcoinqt.a(libbitcoinqt_a-walletcontroller.o)' means the weak symbol cannot be overridden at runtime. This was likely caused by different translation units being compiled with different visibility settings.
(reserved space for GUIX hashes)
Updated 41b6db3 -> d347fc0 (pr21495.01 -> pr21495.02, diff):
|
Guix builds:
|
Gitian builds:
|
Guix is matching, however I'm currently seeing a mismatch for the macOS gitian build. Gitian: 76aef92275ac0ab1b6dac2132c099b7e1a7ab2638baa7fab705e9c53c92b093e bitcoin-d347fc07a54d-osx-unsigned.dmg
ee7242894466d89f8f0161998f759eba47c2f0dd3ecd6c6c34b9c3f86555d293 bitcoin-d347fc07a54d-osx-unsigned.tar.gz
5a3f569c4bcfa91a9494d8a657d0cc3964b4b06e9ec08ecd0cbe2dfeebe1b9b5 bitcoin-d347fc07a54d-osx64.tar.gz
82da4f18b70e5a6546fae2fb6e3a49af90b5d4f0a786f28dc0ab97c895d2d79c src/bitcoin-d347fc07a54d.tar.gz
26feb335e7724f75d655796ddf85513da4fbd66fcb95fa2a99a3936947755802 bitcoin-core-osx-22-res.yml Windows: 4efb257aa171e08fe580e340f3053756aabc1a63c3c1531c14f241f65c7450f6 bitcoin-d347fc07a54d-win-unsigned.tar.gz
946091f99d5d3b3971f6446803ab98f0a51c97d9b9e695846e020276169b5c4e bitcoin-d347fc07a54d-win64-debug.zip
e212000f44df187238bbe6cfae337a30303fb3830bbf41cd4cc3c054716d239a bitcoin-d347fc07a54d-win64-setup-unsigned.exe
72116f9a355183410ebe890bef24094feef51baad40574f48dc59b342790b80c bitcoin-d347fc07a54d-win64.zip
82da4f18b70e5a6546fae2fb6e3a49af90b5d4f0a786f28dc0ab97c895d2d79c src/bitcoin-d347fc07a54d.tar.gz
37f13f87c4d8b556272f611796f7883932d8474d52f74fe6c4376479d658ee02 bitcoin-core-win-22-res.yml Linux: 9312bb39f32c5f4cf9172977fbf94f669acff03623b2647d6138a1322557f1fc bitcoin-d347fc07a54d-aarch64-linux-gnu-debug.tar.gz
ad1080f3b4928ff3d127a9f32029c010e19516ea9495f08e8b217fba6300e919 bitcoin-d347fc07a54d-aarch64-linux-gnu.tar.gz
871194fcafc052c5dc173b81aefaf66840edcc51cc499730ee48c0c96dd390f9 bitcoin-d347fc07a54d-arm-linux-gnueabihf-debug.tar.gz
452e3d2ec8f196afaf8303118cb035b9bd7ee4ee2388187e8f813f4da5943276 bitcoin-d347fc07a54d-arm-linux-gnueabihf.tar.gz
086cb887bc5c554837af39c04c7ea3d50c72e30df1b490d7c798b902bc7a2ba3 bitcoin-d347fc07a54d-powerpc64-linux-gnu-debug.tar.gz
acb165a69e6ee6d3b4ed65793426368a3417a77589fc2cd31834b0b83a81b571 bitcoin-d347fc07a54d-powerpc64-linux-gnu.tar.gz
cc28e87a8c347f68bd76ad3f5b74f151220d1f24690ca389732c6d71a147afea bitcoin-d347fc07a54d-powerpc64le-linux-gnu-debug.tar.gz
533190a2627f9568c87847cbcf5eab136fb329bccdbca3a64a34af1e9e00774b bitcoin-d347fc07a54d-powerpc64le-linux-gnu.tar.gz
a9758cbaec6710135df4b63e84ae374b77b1d72dc1e9b55ed730a00fc1d163b9 bitcoin-d347fc07a54d-riscv64-linux-gnu-debug.tar.gz
5072bcfeda87fe8ccad69694474c9a5fb35ea431cbff75633c8378ecfe4775fa bitcoin-d347fc07a54d-riscv64-linux-gnu.tar.gz
a6fc05be40ce3fa6c0dc76724e9483f5e8386f5bad88b81e60bea2efc1cd7d56 bitcoin-d347fc07a54d-x86_64-linux-gnu-debug.tar.gz
17129aee3cd4bc89de691c2a53df4b6fa20cec14c9c90dec5e0a216e3edfb639 bitcoin-d347fc07a54d-x86_64-linux-gnu.tar.gz
82da4f18b70e5a6546fae2fb6e3a49af90b5d4f0a786f28dc0ab97c895d2d79c src/bitcoin-d347fc07a54d.tar.gz
76fc04d1d9db010d1000c0456126b7a7c7e18be990a45b3ddc19bb9ad08792a1 bitcoin-core-linux-22-res.yml Guix: b2c03db57874a7e52fd11c57f0088711f544671ac52e15cfc68077494b95b113 output/bitcoin-d347fc07a54d-aarch64-linux-gnu-debug.tar.gz
b1d85a5be34f2d65d258f496b191c869d72a221248ca904a6ec3e744131f78f5 output/bitcoin-d347fc07a54d-aarch64-linux-gnu.tar.gz
b2cdadf1ddca6dd91cd1ffd5ef7759689726065a482264a2d99bfc0de8b4390c output/bitcoin-d347fc07a54d-arm-linux-gnueabihf-debug.tar.gz
ca9743cc611a96a027549ecc93fde6ae3f2e54ff461019df11751d8c09f10cfa output/bitcoin-d347fc07a54d-arm-linux-gnueabihf.tar.gz
cda2e1255204ab53f2b63ef04fade646dfc34484617a98a9e2fd0adeb7272699 output/bitcoin-d347fc07a54d-osx-unsigned.dmg
1f45d8ab16658edec3dd35a5656ddefa18d22092b6d2bab4316f48e3540ad571 output/bitcoin-d347fc07a54d-osx-unsigned.tar.gz
07c2a75c5b8f961c6e90e2dcd9d485c66d128285240726b2b7379e7b371631ef output/bitcoin-d347fc07a54d-osx64.tar.gz
f65d24424a922b93c89f7acbcdf916f87d52d65617774a6ba36bbdff4f0a4827 output/bitcoin-d347fc07a54d-powerpc64-linux-gnu-debug.tar.gz
a099d7b4eb75de23acb63fc058b0f4a76a67c6ae0687354836f0346155128792 output/bitcoin-d347fc07a54d-powerpc64-linux-gnu.tar.gz
8aaabbc187a31a08fb9a2808b75b3922937d55c7254f0661933857377365a803 output/bitcoin-d347fc07a54d-powerpc64le-linux-gnu-debug.tar.gz
1df297a669d3f3cfdeb60e296c4e30e3a7b091a6b88b309004fa36970267a01e output/bitcoin-d347fc07a54d-powerpc64le-linux-gnu.tar.gz
b0381ccbe9ac66cad846082a1506284e22a101b9c1c03e461db0ed8c8e45815c output/bitcoin-d347fc07a54d-riscv64-linux-gnu-debug.tar.gz
9d94f534ce7e4b883046072706f5d514e02b9c6c5dfd2e0b66539253fe2f8738 output/bitcoin-d347fc07a54d-riscv64-linux-gnu.tar.gz
6b42298e092d87cd4f77e7eefb234ebeff9d837164b95c8e8c7746ddf8c32e84 output/bitcoin-d347fc07a54d-win-unsigned.tar.gz
40830e316af13eb2885cf9fc258c50ea19f37ec74d5b1b47fe1c709087e47bcc output/bitcoin-d347fc07a54d-win64-debug.zip
08814e7dd420650f18e303ba403d755e0a8384a64eb41cfcc534da00bd81784b output/bitcoin-d347fc07a54d-win64-setup-unsigned.exe
1cb962c79f339236f2f288a2dfa6e7ad99ad1b5964eb7c3248f1c08f379d3657 output/bitcoin-d347fc07a54d-win64.zip
49ae6b04cccd12f6d3cb955380d08503a548f41d7274eab88e0cdfc95609ef51 output/bitcoin-d347fc07a54d-x86_64-linux-gnu-debug.tar.gz
f3ccb66459e8bed50bcfc8e437e7990fad59b05b966de0785cca41b1ceda1b5d output/bitcoin-d347fc07a54d-x86_64-linux-gnu.tar.gz
82da4f18b70e5a6546fae2fb6e3a49af90b5d4f0a786f28dc0ab97c895d2d79c output/src/bitcoin-d347fc07a54d.tar.gz |
Did another gitian build with a clear cache:
It was before when dirty cache causes different hashes, right? |
🐙 This pull request conflicts with the target branch and needs rebase. Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft". |
See details and the patch: https://bugreports.qt.io/browse/QTBUG-87014
Rebased d347fc0 -> ec76bad (pr21495.02 -> pr21495.03) due to the conflict with #17227. |
Builds @ ec76bad 4c487f9c270d42804f8b27822882d884adf7cb30125b523c2781429bae512972 output/bitcoin-ec76bad655b1-osx-unsigned.dmg
dafbf43e498026c282f7530dc09dd00587b3b39825a2947eb85501df3546dcfb output/bitcoin-ec76bad655b1-osx-unsigned.tar.gz
5e04760ac262263af7cc19a6e7faf7eddd610fb7357bec019f7bf74e03114e4e output/bitcoin-ec76bad655b1-osx64.tar.gz
37c144d78dbaef941209769e5bf5197ee96e1fb20b220144bf75b6137d74184a output/src/bitcoin-ec76bad655b1.tar.gz Gitian: 283900007fa528753a23bc01ab04dd2d9c8a14e36697321f6a0501261db66d1b bitcoin-ec76bad655b1-osx-unsigned.dmg
62158f3d6f1bbe1da36d06a32d5b109af18ed17a1acaddb00a1699536d3bb79a bitcoin-ec76bad655b1-osx-unsigned.tar.gz
9b16a47b89283da880cf790d8ae19f9878513f8b3c6dfd9f7bf2094aa1234041 bitcoin-ec76bad655b1-osx64.tar.gz
37c144d78dbaef941209769e5bf5197ee96e1fb20b220144bf75b6137d74184a src/bitcoin-ec76bad655b1.tar.gz
2f6d059f5fb4bacd4d455a2c0bd53289c7e2e6e5e6221487fcb6720d5d8d2967 bitcoin-core-osx-22-res.yml |
Guix build:
Gitian build:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK ec76bad
ec76bad build, qt: Fix static builds on macOS Big Sur (Hennadii Stepanov) Pull request description: See details and the patch in https://bugreports.qt.io/browse/QTBUG-87014 Fixes bitcoin-core/gui#249 ACKs for top commit: fanquake: ACK ec76bad Tree-SHA512: f2fa4a6a1b7dd6d5adc6ef6f5169aedeb3bf45b2b087305e8ab78041755b9f04203d2b0550ee95656042d16775b06da0a17730915b7bff996dd14dd1b6d34ea7
Post merge: I tested on master on macOS 11.2.3. I'm able to run it run |
Unrelated to this PR, but you could silent those warnings by passing the |
FWIW, QTBUG-81297 is fixed in Qt 5.15. |
See details and the patch in https://bugreports.qt.io/browse/QTBUG-87014
Fixes bitcoin-core/gui#249