build: use package_cc for linux qt build #25822
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
GUIX hashes x86: arm64: |
Member
Qt does use the wrong compiler during the configuration phase. It could cause mis-configuration. I believe the correct solution should be similar to bitcoin/depends/packages/qt.mk Lines 265 to 266 in bf3f05f |
Member
Author
I did something like this initially, but that didn't seem to work properly. We might end up needing both changes. |
Member
Author
|
I've pushed up a new change, that seems to work "better", in that the correct compiler is used in more places, and shown in the configure output, but compiling now fails due to something in platform detection: thread/qatomic.cpp:1747:4: error: #error "Q_ATOMIC_INT64_IS_SUPPORTED must be defined on a 64-bit platform"
1747 | # error "Q_ATOMIC_INT64_IS_SUPPORTED must be defined on a 64-bit platform"
| ^~~~~
In file included from global/qt_pch.h:56:
In file included from global/qt_pch.h:56:
../../include/QtCore/../../src/corelib/thread/qbasicatomic.h: In instantiation of ‘class QBasicAtomicInteger<long long unsigned int>’:
thread/qsemaphore.h:70:39: required from here
global/qglobal.h:121:63: error: static assertion failed: template parameter is an integral of a size not supported on this platform
121 | # define Q_STATIC_ASSERT_X(Condition, Message) static_assert(bool(Condition), Message)
| ^~~~~~~~~~~~~~~
../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:97:5: note: in expansion of macro ‘Q_STATIC_ASSERT_X’
97 | Q_STATIC_ASSERT_X(QAtomicOpsSupport<sizeof(T)>::IsSupported, "template parameter is an integral of a size not supported on this platform");
| ^~~~~~~~~~~~~~~~~
make[4]: *** [Makefile:21004: .obj/qsemaphore.o] Error 1 |
Member
|
Modifying of
|
Member
Member
Author
|
I'm not planning on investigating this any further, so we can follow up in #25838. |
fanquake
added a commit
to bitcoin-core/gui
that referenced
this pull request
Aug 15, 2022
…+` for all Linux hosts 59f2cc2 build, qt: Use `mkspecs/bitcoin-linux-g++` for all Linux hosts (Hennadii Stepanov) d61f667 build: Add objcopy host tool (Hennadii Stepanov) a2e733b doc: Remove no longer needed comments (Hennadii Stepanov) 968ea66 build: Adjust `qt/guix_cross_lib_path.patch` (Hennadii Stepanov) Pull request description: This PR is an alternative to bitcoin/bitcoin#25822. Fixes bitcoin/bitcoin#22184. Also added some minor patch and comment improvements. Guix build on `x86_64`: ``` e5d3e7963339085fce3074c610613f9b6f2daf4f94ca86585c2ef276ac451c2f guix-build-59f2cc23e0d3/output/aarch64-linux-gnu/SHA256SUMS.part 43bc602bf372996069ba18dfbd6a5615b60c259a26639f59cb86b25457578b2b guix-build-59f2cc23e0d3/output/aarch64-linux-gnu/bitcoin-59f2cc23e0d3-aarch64-linux-gnu-debug.tar.gz ec894ba0c4036e09e93fbbbf2473992154b73de6f3a2beb22c69ae9dc48337bb guix-build-59f2cc23e0d3/output/aarch64-linux-gnu/bitcoin-59f2cc23e0d3-aarch64-linux-gnu.tar.gz 0b2edbb8465da7bec04b7ee9856a43bf6b06714dedabe24df0e63b56d6cb6f30 guix-build-59f2cc23e0d3/output/arm-linux-gnueabihf/SHA256SUMS.part 7131d53947ea70a900727342e34a53d6dd6c32cff032e2e68d783ce1ed25bc97 guix-build-59f2cc23e0d3/output/arm-linux-gnueabihf/bitcoin-59f2cc23e0d3-arm-linux-gnueabihf-debug.tar.gz 0c22e7459c26edf3c503a7cb3de6e727aa98b2950c93f6558f0befcc42391d13 guix-build-59f2cc23e0d3/output/arm-linux-gnueabihf/bitcoin-59f2cc23e0d3-arm-linux-gnueabihf.tar.gz 4b95d4a4f159aae8fbe0c842280872908da399f95ea9d3abb8c8889015e56c18 guix-build-59f2cc23e0d3/output/arm64-apple-darwin/SHA256SUMS.part d1e343dbb089d4747fdbed278b4234974861bd35a7a7d74c03b6fe9267e280a2 guix-build-59f2cc23e0d3/output/arm64-apple-darwin/bitcoin-59f2cc23e0d3-arm64-apple-darwin-unsigned.dmg dc8851cad1e5d8e5538f93c42184fc11cac3320ef423425aa37567f6911527f8 guix-build-59f2cc23e0d3/output/arm64-apple-darwin/bitcoin-59f2cc23e0d3-arm64-apple-darwin-unsigned.tar.gz 5fbeb911e207467a96ac0559c5f62bead6d1d382a8808bfd170c2475ebfe78e2 guix-build-59f2cc23e0d3/output/arm64-apple-darwin/bitcoin-59f2cc23e0d3-arm64-apple-darwin.tar.gz b96183a15be11717dc5b250e1c9921c118d26c613de2e5bee1bf3f70f2d1d3fe guix-build-59f2cc23e0d3/output/dist-archive/bitcoin-59f2cc23e0d3.tar.gz 90ee33b1013e30d3679f96c2496767b47493125329b5ff93c91bcf94e5e6ffcd guix-build-59f2cc23e0d3/output/powerpc64-linux-gnu/SHA256SUMS.part 7e52a6a8f4f739a7ab276c50bb42f7803856c8a15b5fdde47ed2d076492102f8 guix-build-59f2cc23e0d3/output/powerpc64-linux-gnu/bitcoin-59f2cc23e0d3-powerpc64-linux-gnu-debug.tar.gz 21d59e074f9a89c6bbb6f6eb58084eddd1c1e24fe338b25c6d58080efd17d0bb guix-build-59f2cc23e0d3/output/powerpc64-linux-gnu/bitcoin-59f2cc23e0d3-powerpc64-linux-gnu.tar.gz 64375860ca1ca30951f3b4b68e5fc56421437486caccd6d18a6c63c104a1dc04 guix-build-59f2cc23e0d3/output/powerpc64le-linux-gnu/SHA256SUMS.part 0f568e92a14f849c5cd36b09628ba79537c2421227b43979ed743bbd543d1e82 guix-build-59f2cc23e0d3/output/powerpc64le-linux-gnu/bitcoin-59f2cc23e0d3-powerpc64le-linux-gnu-debug.tar.gz 8dbe29a4620fc07c70e2748927adfe32604900977d5fe9689930024dfae5350b guix-build-59f2cc23e0d3/output/powerpc64le-linux-gnu/bitcoin-59f2cc23e0d3-powerpc64le-linux-gnu.tar.gz 022644aabcd458f3c24931dab4c34db5bdf96209585eb82739c4b88536a09e58 guix-build-59f2cc23e0d3/output/riscv64-linux-gnu/SHA256SUMS.part 5a0d54f8837a3132b42926f4c8bb45127fd2ef3d49cd238cd1889ca1255c79b1 guix-build-59f2cc23e0d3/output/riscv64-linux-gnu/bitcoin-59f2cc23e0d3-riscv64-linux-gnu-debug.tar.gz da3d43ec2cb1624503fc3bae2c4099b608fdd6d9a47cd3dd3c0c7e35b6031cff guix-build-59f2cc23e0d3/output/riscv64-linux-gnu/bitcoin-59f2cc23e0d3-riscv64-linux-gnu.tar.gz bde0bc14ac320d91b7868dbe44ebb57cf8d74d35d21456d3ae71aced42d17922 guix-build-59f2cc23e0d3/output/x86_64-apple-darwin/SHA256SUMS.part 95322c099de80d660350b383a10ca8a074fe80656b6917085e942c31696226ff guix-build-59f2cc23e0d3/output/x86_64-apple-darwin/bitcoin-59f2cc23e0d3-x86_64-apple-darwin-unsigned.dmg 78ad02298ccba816d03a929ad42570d2ed5af0942e1dd26d69e8f9b96112269f guix-build-59f2cc23e0d3/output/x86_64-apple-darwin/bitcoin-59f2cc23e0d3-x86_64-apple-darwin-unsigned.tar.gz 3fec9daf0bb52aba9218d3e62ef3970329757889a316a10708275e67d7930c8c guix-build-59f2cc23e0d3/output/x86_64-apple-darwin/bitcoin-59f2cc23e0d3-x86_64-apple-darwin.tar.gz 7790af2005756f737986da24da349e406e765af4300ee7e391660e4d1fe6025e guix-build-59f2cc23e0d3/output/x86_64-linux-gnu/SHA256SUMS.part 8b97e9f9a974beacfb6b9661b6fe562a850047d40589f4fa9d069eb1692548c3 guix-build-59f2cc23e0d3/output/x86_64-linux-gnu/bitcoin-59f2cc23e0d3-x86_64-linux-gnu-debug.tar.gz 77bb105155a72f2cfa6160bdb8c02e0621381005db0569dc8df6045b65dac0f8 guix-build-59f2cc23e0d3/output/x86_64-linux-gnu/bitcoin-59f2cc23e0d3-x86_64-linux-gnu.tar.gz 15fbbbe58a2632dabadfa145e4e55103589102e67ec483187275c522d98298bd guix-build-59f2cc23e0d3/output/x86_64-w64-mingw32/SHA256SUMS.part d50afc0061812aadca68ac530e301937e69893881d184ba4c38b37e4ff1a74ba guix-build-59f2cc23e0d3/output/x86_64-w64-mingw32/bitcoin-59f2cc23e0d3-win64-debug.zip a86a5cf85036bb45d2233b0d83bf21f5cd26f463a7a794077995622a47589940 guix-build-59f2cc23e0d3/output/x86_64-w64-mingw32/bitcoin-59f2cc23e0d3-win64-setup-unsigned.exe ca06c5ba64f0a0961c11c1573c04f142fdf369da29f4e8e54f89f3b98f6964ec guix-build-59f2cc23e0d3/output/x86_64-w64-mingw32/bitcoin-59f2cc23e0d3-win64-unsigned.tar.gz b120fdcde18f330c462d6f7100abeb8cc6e26d9034f50c0957fa40067be3dea9 guix-build-59f2cc23e0d3/output/x86_64-w64-mingw32/bitcoin-59f2cc23e0d3-win64.zip ``` ACKs for top commit: fanquake: ACK 59f2cc2 - Making this more generic also fixes other Qt builds [that were previously failing](bitcoin/bitcoin#25838 (comment)). Tree-SHA512: 465f506964293429e55222b40a3927261aa5abd84ecb7bc1257e1b25a8d944967c4aa6e6d7d4afc25ea401d19e5c2d3eb093e073fc29478a8b1626d62cd53275
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Could be enough to close #22184.
Guix Build (x86_64):
Guix Build (arm64):