-
Notifications
You must be signed in to change notification settings - Fork 37.7k
build: lrelease requires xml if not cross-building #19785
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
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsNo conflicts as of last run. |
Rebased 1f168e6 -> eb185da (pr19785.01 -> pr19785.02) due to the conflict with #19761. |
@fanquake Mind reviewing this PR? |
~0
I think the issue here is more nuanced, otherwise macOS depends builds would be completely broken. I can recreate the failure (and have seen it before), but only when using a newer version of GNU make than I normally would for building. i.e I can build depends (2562d5d) using the stock macOS Info: creating stash file /Users/michael/github/fanquake-bitcoin/depends/work/build/x86_64-apple-darwin19.6.0/qt/5.9.8-cecb3adcd3c/qttranslations/.qmake.stash
Info: creating stash file /Users/michael/github/fanquake-bitcoin/depends/work/build/x86_64-apple-darwin19.6.0/qt/5.9.8-cecb3adcd3c/qttools/.qmake.stash
Project ERROR: Unknown module(s) in QT: xml
gmake: *** [funcs.mk:263: /Users/michael/github/fanquake-bitcoin/depends/work/build/x86_64-apple-darwin19.6.0/qt/5.9.8-cecb3adcd3c/qtbase/.stamp_configured] Error 3
gmake: Leaving directory '/Users/michael/github/fanquake-bitcoin/depends' So, it seems that when you're using make 3.8, Maybe there's a |
FWIW, the Qt 5.9.8 code explicitly points to
|
For the sake of keeping the Qt build as small as possible. I would really prefer a solution that doesn't require enabling This looks like an upstream issue? |
I don't think so. Actually, |
For another data point here. I've tested #19716 (updated to qt 5.15.1 but not yet pushed) with make 3.81 and make 4.3 and both build fine on macOS without any additional xml related changes. So this might be something that is just going to "fix itself". |
I don't think we are going to go ahead with this change. This has been "broken" for some time now, and hasn't really been much of an inconvenience. As mentioned above, this will also be fixed with seemingly no additional changes when we move to qt 5.15, so I'm going to close this PR for now. I any case if we were to merge a change like this, I'd really like to know why master currently works with one version of make, and not another. |
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
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
On macOS 10.15.6 (19G2021):
The same issue was reported in #14648 for macOS 10.13.6.
#18536 reports about the similar issue on ARM 32bit.
Fix #14648
Fix #18536