build, qt: Fix wrong cross-compiling detection on macOS #21591
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
|
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. |
This was referenced Apr 4, 2021
jarolrod
reviewed
Apr 4, 2021
There was a problem hiding this comment.
ACK 9d65a3b
This does seem to fix the cross-compilation issue (tested on macOS 11.2.3):
Master
Configure summary:
Building on: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Building for: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Target compiler: clang (Apple) 12.0.0
Configuration: cross_compile sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd shani silent x86SimdAlways release c++11 c++14 c++1z reduce_exports static stl
PR
Configure summary:
Build type: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Compiler: clang (Apple) 12.0.0
Configuration: sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd shani silent x86SimdAlways release c++11 c++14 c++1z reduce_exports static stl
One observation is that macOS dark mode is still broken and does not work after building from depends with this PR.
|
Rebased 9d65a3b -> d6957db (pr21591.10 -> pr21591.11) due to the conflict with #21375. |
jarolrod
reviewed
Apr 12, 2021
There was a problem hiding this comment.
tACK d6957db
Tested after rebase. Confirmed clean rebase.
Configure summary:
Build type: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Compiler: clang (Apple) 12.0.0
Configuration: sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd shani silent x86SimdAlways release c++11 c++14 c++1z reduce_exports static stl
GUIX hashes for d6957db
find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
3bb8d6c802d9496de444ff7bdc4406b77a32e21e583f72491eab2ff46c48ec38 guix-build-d6957db418de/output/aarch64-linux-gnu/bitcoin-d6957db418de-aarch64-linux-gnu-debug.tar.gz
a5c1fd6511ea70aaafc7c4165e7e3ec75680cc3677051af2f0522eaabe6379bd guix-build-d6957db418de/output/aarch64-linux-gnu/bitcoin-d6957db418de-aarch64-linux-gnu.tar.gz
1b4577f79cb2fef406f8e55b3e9bc6038a6e9cb1bf6af29755a56d5140c33aa5 guix-build-d6957db418de/output/arm-linux-gnueabihf/bitcoin-d6957db418de-arm-linux-gnueabihf-debug.tar.gz
9628ea5cfc7c6fc9638d1392d3dcb5d08ddd1be7cba0a2210878ae8423b371e9 guix-build-d6957db418de/output/arm-linux-gnueabihf/bitcoin-d6957db418de-arm-linux-gnueabihf.tar.gz
b0940099af567af12efc8fb5d7efe819acb348c5cbf9bf3ac0b335580d92e305 guix-build-d6957db418de/output/dist-archive/bitcoin-d6957db418de.tar.gz
30873201e28454c761b555d02c2779e24c6d52cf9cdde1ffc6960523459022a4 guix-build-d6957db418de/output/powerpc64-linux-gnu/bitcoin-d6957db418de-powerpc64-linux-gnu-debug.tar.gz
63f296cd22162f8ebefb2ece23478e893d6619b8bec19b0a903b20be93abc8d2 guix-build-d6957db418de/output/powerpc64-linux-gnu/bitcoin-d6957db418de-powerpc64-linux-gnu.tar.gz
ec35c1caab51c20b5727474b354ec15f703b6d8137e135ce1056b6774702db03 guix-build-d6957db418de/output/powerpc64le-linux-gnu/bitcoin-d6957db418de-powerpc64le-linux-gnu-debug.tar.gz
3bc72a60d241927acb01a8735cf84862080c570bd95d4cb1feb67341db74ed5d guix-build-d6957db418de/output/powerpc64le-linux-gnu/bitcoin-d6957db418de-powerpc64le-linux-gnu.tar.gz
e326d08c9df3a2254c9640b515fec1ae07de9e2b7c3ec033b05f8f8ca49cabb4 guix-build-d6957db418de/output/riscv64-linux-gnu/bitcoin-d6957db418de-riscv64-linux-gnu-debug.tar.gz
aa35c4c05ca44b37e717b2f396a21c6e4815d0664732a3219a8d878f073b67d7 guix-build-d6957db418de/output/riscv64-linux-gnu/bitcoin-d6957db418de-riscv64-linux-gnu.tar.gz
508ad49a29cb93d16005cbb23d8a635875f4f2e12ab47b22859408f07fc9d0fd guix-build-d6957db418de/output/x86_64-apple-darwin18/bitcoin-d6957db418de-osx-unsigned.dmg
beca3c3402a35c71339ddd11b11b62c3f48d27bd4093f6446cac3c9df9c61a63 guix-build-d6957db418de/output/x86_64-apple-darwin18/bitcoin-d6957db418de-osx-unsigned.tar.gz
ab866b269ab6cfcbfac9eb529357263b073acbe6bcbcf2872c6959b2d9a4027b guix-build-d6957db418de/output/x86_64-apple-darwin18/bitcoin-d6957db418de-osx64.tar.gz
06aef097b2116a124a6a69c2df930fc41d522e2307cf85112670e6ed752d29ac guix-build-d6957db418de/output/x86_64-linux-gnu/bitcoin-d6957db418de-x86_64-linux-gnu-debug.tar.gz
7408d67fcf04efd7790f717a44a3cc75893247f5f34271afa812ec677be00fab guix-build-d6957db418de/output/x86_64-linux-gnu/bitcoin-d6957db418de-x86_64-linux-gnu.tar.gz
0a85354d2d19f1cb0b2835cf1a8b6f0e6f37188b99d66cb9cdab10a33924b897 guix-build-d6957db418de/output/x86_64-w64-mingw32/bitcoin-d6957db418de-win-unsigned.tar.gz
3a964a6d827267157476448f55c3c1f9c7851fcbfcac27bcf02da36e1c043684 guix-build-d6957db418de/output/x86_64-w64-mingw32/bitcoin-d6957db418de-win64-debug.zip
a94537a016a1b83d1be233c8bcabb883461f55152b66ccf6e99f95842b27c200 guix-build-d6957db418de/output/x86_64-w64-mingw32/bitcoin-d6957db418de-win64-setup-unsigned.exe
cb93d125452a39f68cb9b64d099c088627435343ca4d0568bab91184bc132006 guix-build-d6957db418de/output/x86_64-w64-mingw32/bitcoin-d6957db418de-win64.zip
Guix builds: |
Guix builds:
|
Another observation. |
Fixed in #21793. |
This change makes Qt tools always bootstrapped.
|
Rebased d6957db -> 4a9b4e9 (pr21591.11 -> pr21591.12) due to the conflict with #22054. |
Guix builds: |
|
Could the "22.0" milestone be assigned to this PR? |
jarolrod
reviewed
Jun 6, 2021
There was a problem hiding this comment.
Concept ACK, there is a mismatch in guix hashes
Tested on macOS 11.3
Master:
Building on: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Building for: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Target compiler: clang (Apple) 12.0.5
Configuration: cross_compile sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd shani silent x86SimdAlways release c++11 c++14 c++1z reduce_exports static stl
PR:
Build type: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Compiler: clang (Apple) 12.0.5
Configuration: sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd shani silent x86SimdAlways release c++11 c++14 c++1z reduce_exports static stl
GUIX Hashes:
We have a mismatch with the powerpc hashes, will run another GUIX build to double-check
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
3f418196aea1d87d6b1b0aa975a292d08e902d0a7127cf44fb5033376dcd2d22 guix-build-4a9b4e96765c/output/aarch64-linux-gnu/bitcoin-4a9b4e96765c-aarch64-linux-gnu-debug.tar.gz
d405d79a148c0a6a8c4931da1cc188d8d610b6644fe88d96ec1e47c96d2b0412 guix-build-4a9b4e96765c/output/aarch64-linux-gnu/bitcoin-4a9b4e96765c-aarch64-linux-gnu.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/aarch64-linux-gnu/inputs.SHA256SUMS
360d8c1c1b1b442933553c5a6561f85427f3c58033b1ca3c5522fb843f6e7f30 guix-build-4a9b4e96765c/output/arm-linux-gnueabihf/bitcoin-4a9b4e96765c-arm-linux-gnueabihf-debug.tar.gz
1218f04bb34b0bb6b9998c15b8db966a30c08bc0ea4c13bd381a971eea069e3f guix-build-4a9b4e96765c/output/arm-linux-gnueabihf/bitcoin-4a9b4e96765c-arm-linux-gnueabihf.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/arm-linux-gnueabihf/inputs.SHA256SUMS
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-4a9b4e96765c/output/dist-archive/SKIPATTEST.TAG
dadbf6a94c7236ec8d7aebd0eb5567f822ca39602e188a11972beb87a0699b37 guix-build-4a9b4e96765c/output/dist-archive/bitcoin-4a9b4e96765c.tar.gz
19830fc74c5853a901e49989587285cd90074ff60e06c3c317a86765c8e1cfc8 guix-build-4a9b4e96765c/output/powerpc64-linux-gnu/bitcoin-4a9b4e96765c-powerpc64-linux-gnu-debug.tar.gz
351149de638d965f843ff954729f38fc425ee88ffd4fa747093493c4e0cdc64c guix-build-4a9b4e96765c/output/powerpc64-linux-gnu/bitcoin-4a9b4e96765c-powerpc64-linux-gnu.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/powerpc64-linux-gnu/inputs.SHA256SUMS
ffa9d203e9aa97a375eda98e0cccec53ad999e8110f6a033f79d464a8039fc13 guix-build-4a9b4e96765c/output/powerpc64le-linux-gnu/bitcoin-4a9b4e96765c-powerpc64le-linux-gnu-debug.tar.gz
8685bcee5899db8891fc2f1ac2d6a7e0039304783ff5282a4168ece1e5f9bd24 guix-build-4a9b4e96765c/output/powerpc64le-linux-gnu/bitcoin-4a9b4e96765c-powerpc64le-linux-gnu.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/powerpc64le-linux-gnu/inputs.SHA256SUMS
9ac1e9a3ff77510af52fb2715e103edfdf08bace4ed36f5b2fca520c0664c736 guix-build-4a9b4e96765c/output/riscv64-linux-gnu/bitcoin-4a9b4e96765c-riscv64-linux-gnu-debug.tar.gz
a42666f8a6a3fc6d18a90a4d1db1c7df2e91b68bfb17a4e63ee2159f3ce0ea33 guix-build-4a9b4e96765c/output/riscv64-linux-gnu/bitcoin-4a9b4e96765c-riscv64-linux-gnu.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/riscv64-linux-gnu/inputs.SHA256SUMS
db1128403aaee16f0421d848b77c37def9a9a4bf352be967b0c44957a2c02e2d guix-build-4a9b4e96765c/output/x86_64-apple-darwin18/bitcoin-4a9b4e96765c-osx-unsigned.dmg
59d3bb4f3c808a75f1440be5d391664147f3dd1e5caddb638fb274601f932341 guix-build-4a9b4e96765c/output/x86_64-apple-darwin18/bitcoin-4a9b4e96765c-osx-unsigned.tar.gz
db2b4ff5de15d8d1006d5c3649ff7a7154c0a1886e8b5673197e10b51d5c24ff guix-build-4a9b4e96765c/output/x86_64-apple-darwin18/bitcoin-4a9b4e96765c-osx64.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/x86_64-apple-darwin18/inputs.SHA256SUMS
b9a8f42807030f8c8d4d96e62adf27e97fdb591b07359a87376701a9918f7a96 guix-build-4a9b4e96765c/output/x86_64-linux-gnu/bitcoin-4a9b4e96765c-x86_64-linux-gnu-debug.tar.gz
32428117208a95f4c5675ae75453716de73b0720dc6ec2ff4be40abecdc9a57b guix-build-4a9b4e96765c/output/x86_64-linux-gnu/bitcoin-4a9b4e96765c-x86_64-linux-gnu.tar.gz
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/x86_64-linux-gnu/inputs.SHA256SUMS
d0895a083e51e1ec2c2a3c6a81759da9158c417c5813af8429af2b767adb9b8c guix-build-4a9b4e96765c/output/x86_64-w64-mingw32/bitcoin-4a9b4e96765c-win-unsigned.tar.gz
3989e8b4b36ec102256068735ebe4c8674092fa9de2b5fcb6789cdd818ce35c7 guix-build-4a9b4e96765c/output/x86_64-w64-mingw32/bitcoin-4a9b4e96765c-win64-debug.zip
99871fbe0354b4756011cd651623a9071fe755bccc881dbacde1d55bf7b73edd guix-build-4a9b4e96765c/output/x86_64-w64-mingw32/bitcoin-4a9b4e96765c-win64-setup-unsigned.exe
0ce79d93ef47ab2e1ab4de26c67eb7dd05d848c6588bc66d24e8bfeb19eb18e5 guix-build-4a9b4e96765c/output/x86_64-w64-mingw32/bitcoin-4a9b4e96765c-win64.zip
379478d9dcd88db13d90a2ba46d7bc1866a19f58d1d31345527f08666e581d44 guix-build-4a9b4e96765c/output/x86_64-w64-mingw32/inputs.SHA256SUMS
|
For now, I'm going to close this PR, as it's included as part of #22142. If, for some reason, we can't get that change done fairly shortly, I'll reopen this PR. |
fanquake
added a commit
that referenced
this pull request
Jul 18, 2021
1155978 build, qt: Do not install *.prl files (Hennadii Stepanov) 763793b build, qt: Fix wrong cross-compiling detection on macOS (Hennadii Stepanov) 3098272 build, qt: Force bootstrap while building linguist tools (Hennadii Stepanov) 689320e build, qt: Drop translations.pro hack (Hennadii Stepanov) 6a1f98f build, qt: Drop lrelease dependency patch (Hennadii Stepanov) 39e561e build, qt: Add linguist_tools list (Hennadii Stepanov) 27d3def build: Use Qt top-level build facilities (Hennadii Stepanov) Pull request description: This PR: - uses Qt top-level build facilities without the need to download all-in-one archive - is based on **BlockMechanic**'s [idea](#20600), and is an alternative to #20600 - makes it easy to integrate [new modules](#16883) into static builds - has the minimal diff - makes the qt package build process streamlined by dropping some patches and hacks (an alternative to #21420 and #20642) Fixes #18536 (a non-intrusive alternative to #21589 and #19785). Fixes #14648. Fixes #21588 (a non-intrusive alternative to #21591). Required for adding [Wayland support](#19950) on Linux. --- **Note for reviewers**: With 9046de8 from #21995 it is easy to verify that there are no changes in the resulted `qt` package archive on the per commit basis. For example, for `HOST=i686-pc-linux-gnu` no commit in this PR introduces any changes. ACKs for top commit: fanquake: ACK 1155978 Tree-SHA512: 667b06b72cb7ff26d68b9b88e8dddb51084783ca9e3d80b3392710794c1dc7fd77bbcc3ccf4ccece9919d33b9bf8fce13c5059502bd228021dc7c93fdb87ca7a
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jul 23, 2021
1155978 build, qt: Do not install *.prl files (Hennadii Stepanov) 763793b build, qt: Fix wrong cross-compiling detection on macOS (Hennadii Stepanov) 3098272 build, qt: Force bootstrap while building linguist tools (Hennadii Stepanov) 689320e build, qt: Drop translations.pro hack (Hennadii Stepanov) 6a1f98f build, qt: Drop lrelease dependency patch (Hennadii Stepanov) 39e561e build, qt: Add linguist_tools list (Hennadii Stepanov) 27d3def build: Use Qt top-level build facilities (Hennadii Stepanov) Pull request description: This PR: - uses Qt top-level build facilities without the need to download all-in-one archive - is based on **BlockMechanic**'s [idea](bitcoin#20600), and is an alternative to bitcoin#20600 - makes it easy to integrate [new modules](bitcoin#16883) into static builds - has the minimal diff - makes the qt package build process streamlined by dropping some patches and hacks (an alternative to bitcoin#21420 and bitcoin#20642) Fixes bitcoin#18536 (a non-intrusive alternative to bitcoin#21589 and bitcoin#19785). Fixes bitcoin#14648. Fixes bitcoin#21588 (a non-intrusive alternative to bitcoin#21591). Required for adding [Wayland support](bitcoin#19950) on Linux. --- **Note for reviewers**: With 9046de8 from bitcoin#21995 it is easy to verify that there are no changes in the resulted `qt` package archive on the per commit basis. For example, for `HOST=i686-pc-linux-gnu` no commit in this PR introduces any changes. ACKs for top commit: fanquake: ACK 1155978 Tree-SHA512: 667b06b72cb7ff26d68b9b88e8dddb51084783ca9e3d80b3392710794c1dc7fd77bbcc3ccf4ccece9919d33b9bf8fce13c5059502bd228021dc7c93fdb87ca7a
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When running
make -C depends qt_configuredit is expected that Qt is configured for a native build. That is not the case on master (ad4bf8a) on macOS.This PR fixes this behavior. The diff for Qt's "Configure summary":
Related to #21588.
Based on #21589, only the last commit belongs to this PR.
Guix builds:
Gitian builds: