depends: Use Qt top-level build facilities by hebasto · Pull Request #20641 · bitcoin/bitcoin

hebasto · 2020-12-13T14:31:34Z

This PR:

uses Qt top-level build facilities without the need to download all-in-one archive
is based on BlockMechanic's idea, and is an alternative to Depends : Qt Use Top-Level Structure #20600
makes it easy to integrate new modules into static builds
has the minimal diff
makes the qt package build process streamlined by dropping some patches and hacks (an alternative to build, qt: No longer need to patch translation.pro #21420 and depends: Drop unneeded patches for qt package #20642)

Fixes #18536 (a non-intrusive alternative to #21589 and #19785).

Fixes #21588 (a non-intrusive alternative to #21591).

Required for adding Wayland support 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.

BlockMechanic · 2020-12-13T15:29:06Z

This seems pretty clean, testing. Had you tested this with additional modules ? (that was my reasoning for changing the way QT builds)

hebasto · 2020-12-13T15:35:57Z

Had you tested this with additional modules ? (that was my reasoning for changing the way QT builds)

I've started with the following qt.pro

# Create the super cache so modules will add themselves to it.
cache(, super)

CONFIG += prepare_docs qt_docs_targets

TEMPLATE = subdirs
SUBDIRS = qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 qttools qttranslations

qtbase.target = module-qtbase

qtdeclarative.target = module-qtdeclarative
qtdeclarative.depends = qtbase

qtgraphicaleffects.target = module-qtgraphicaleffects
qtgraphicaleffects.depends = qtdeclarative

qtquickcontrols2.target = module-qtquickcontrols2
qtquickcontrols2.depends = qtgraphicaleffects

qttools.target = module-qttools
qttools.depends = qtbase qtdeclarative

qttranslations.target = module-qttranslations
qttranslations.depends = qttools

QT_SKIP_MODULES =

load(qt_configure)

that works, and reduced changes to this minimal diff.

BlockMechanic · 2020-12-13T15:42:42Z

Had you tested this with additional modules ? (that was my reasoning for changing the way QT builds)

I've started with the following qt.pro

that works, and reduced changes to this minimal diff.

I will test this, great work !

promag · 2020-12-13T16:09:15Z

Is there any advantage of this approach beside avoid downloading the full source archive?

hebasto · 2020-12-13T16:31:35Z

Is there any advantage of this approach beside avoid downloading the full source archive?

Not dealing with unneeded stuff, I guess.

BlockMechanic · 2020-12-13T16:44:36Z

Is there any advantage of this approach beside avoid downloading the full source archive?

Not that i can see. but it is much cleaner IMO.

DrahtBot · 2020-12-13T22:43:45Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

build: Add support for Android NDK r22+ #22469 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.

icota · 2020-12-14T08:23:46Z

depends/patches/qt/qt.pro

@@ -0,0 +1,17 @@
+# Create the super cache so modules will add themselves to it.


Should we move this file and mac-qmake.conf to ../../configs/qt?

Files in the depends/patches/<package>/ directory are subjects of a build hash calculation. So, I don't think that moving some of them to another directory is a good idea.

One could add depends/configs to the calculation. No big deal either way, perhaps I'm nitpicking

laanwj · 2020-12-16T17:21:05Z

Is there any advantage of this approach beside avoid downloading the full source archive?

The full Qt source archive is huge. I prefer being selective.

hebasto · 2020-12-25T09:10:14Z

Rebased 770e40c -> b72ff7c (pr20641.01 -> pr20641.02) due to the conflict with #20673.

promag · 2021-01-08T20:50:14Z

Is there any advantage of this approach beside avoid downloading the full source archive?

The full Qt source archive is huge. I prefer being selective.

@laanwj true, in Qt 5.15. But in Qt 6 the fat module (qtwebengine-everywhere-src-5.15.2.tar.xz with 267M) is gone, see
http://download.qt.io/official_releases/qt/5.15/5.15.2/single/ and http://download.qt.io/official_releases/qt/6.0/6.0.0/single/.

promag · 2021-01-08T20:52:55Z

Concept ACK.

BlockMechanic · 2021-01-09T03:16:50Z

@hebasto check out how I selected the required components using gitmodules, it effectively keeps compile time the same, while allowing easier addition/removal of modules.

hebasto · 2021-01-09T08:06:05Z

@hebasto check out how I selected the required components using gitmodules, it effectively keeps compile time the same, while allowing easier addition/removal of modules.

Which branch?

BlockMechanic · 2021-01-09T08:09:27Z

@hebasto check out how I selected the required components using gitmodules, it effectively keeps compile time the same, while allowing easier addition/removal of modules.

Which branch?
see files gitmodules and fix_git_modules.patch here :- https://github.com/bitcoin/bitcoin/pull/20600/files

It is no longer required after switching to Qt top-level build.

Qt lrelease tool depends on the xml module. This change guarantees that it is always available after being bootstrapped.

hebasto · 2021-06-15T21:26:04Z

Updated 5ca6e8f -> 763793b (pr20641.05 -> pr20641.06):

dropped some unimportant commits
improved compatibility with possible module addition
rebased

@fanquake

makes it easy to integrate new modules into static builds

Can you demonstrate this in a branch on top of these changes?

See: hebasto:201213-top-DEMO.

hebasto · 2021-06-16T03:00:28Z

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
5bb23a2c9ff259da9516f763afaec4ebef92214bb21d5f8eb4818019e12d19df  guix-build-1155978d8f3f/output/aarch64-linux-gnu/bitcoin-1155978d8f3f-aarch64-linux-gnu-debug.tar.gz
764d717839128d1a5194b48a953ee162248a782d8614a5aa8f498c27460768f1  guix-build-1155978d8f3f/output/aarch64-linux-gnu/bitcoin-1155978d8f3f-aarch64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/aarch64-linux-gnu/inputs.SHA256SUMS
0e3bd95c99ba0da448fd9472044b914170e6b9dc4ac7e2b2c44925b9d69bda24  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/bitcoin-1155978d8f3f-arm-linux-gnueabihf-debug.tar.gz
9d47357c5f17d06299fa8e0185738a824be77b6bf1436f478dc0a6ed82c7b322  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/bitcoin-1155978d8f3f-arm-linux-gnueabihf.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/inputs.SHA256SUMS
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-1155978d8f3f/output/dist-archive/SKIPATTEST.TAG
13ab7d91d5b1f74d0c78eec7a883936b06bfaae588f7b1526fa90217ca8c036d  guix-build-1155978d8f3f/output/dist-archive/bitcoin-1155978d8f3f.tar.gz
b41233eb7319591fe2cb4e672e043dafdb72b07ee222e7fe9325f1ea017a78ee  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/bitcoin-1155978d8f3f-powerpc64-linux-gnu-debug.tar.gz
567684b9b557faf75995974f1c5ebfd416404041ada78681802b975375a7c28f  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/bitcoin-1155978d8f3f-powerpc64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/inputs.SHA256SUMS
598dbdea2a7cf0dea53319dfa51a71cafe1704241fb4212627371091a477aacb  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/bitcoin-1155978d8f3f-powerpc64le-linux-gnu-debug.tar.gz
a40d830d088d411a0b11e43fd0df8c0369477494ee3d8dd621d6f81784bcf195  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/bitcoin-1155978d8f3f-powerpc64le-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/inputs.SHA256SUMS
dd8591dc616fe54448078cad962704ba226994aa232f65bc3db7312d68eb15c8  guix-build-1155978d8f3f/output/riscv64-linux-gnu/bitcoin-1155978d8f3f-riscv64-linux-gnu-debug.tar.gz
7c63e4f88eee0692ed206cfe8724b50f7ee81844a433f30254a1e7afce16e8c2  guix-build-1155978d8f3f/output/riscv64-linux-gnu/bitcoin-1155978d8f3f-riscv64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/riscv64-linux-gnu/inputs.SHA256SUMS
29c151d971ae7cf1ebaf90a29882f32a777d4221dbc8e1ffb75c87e66301cbbe  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx-unsigned.dmg
335a5f02fed8487635924ffcd8cd60d705b090a31c543e4d5a2adb3538dcf333  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx-unsigned.tar.gz
932925c550c588f5ebff562ee5c495fbe437cd7e2a620aa965ca4f578c5baf1d  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx64.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/inputs.SHA256SUMS
5e30a07ed4976a6cbe1ca24b3c3e03954c65132a2cdc9d7d6bbc0e3a18521600  guix-build-1155978d8f3f/output/x86_64-linux-gnu/bitcoin-1155978d8f3f-x86_64-linux-gnu-debug.tar.gz
d602eaf5d69bc3c29d28a6540b565cf330d0905fcf365752989757fd5b6d5990  guix-build-1155978d8f3f/output/x86_64-linux-gnu/bitcoin-1155978d8f3f-x86_64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-linux-gnu/inputs.SHA256SUMS
c98df448196f382d8b4f0046210535e2ec75cc70161cf248e91f8e75f075de23  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win-unsigned.tar.gz
10a3b9196678ae10229f99bf74a10119c82e665eec21d1c5b77c81ba758803c2  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64-debug.zip
6b2bdd460c6df7ef5dcf149feae5c92056713a6f173bb45737c2c95ccc89efd1  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64-setup-unsigned.exe
7ba0334921fffa8d9989d1d110c0bb106049362f562e5d3bc6e2cdfa642c4084  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64.zip
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/inputs.SHA256SUMS

hebasto · 2021-06-16T05:21:01Z

Gitian builds:

Linux

Generating report
1d5173dedbcac24a458b97bdb8e2634dc8434e40ab84d5c551d3a4fb680d0344  bitcoin-1155978d8f3f-aarch64-linux-gnu-debug.tar.gz
9b05b71039bc0690bd6d44342f1823354acc3567098c1a1e647e93a27cc37459  bitcoin-1155978d8f3f-aarch64-linux-gnu.tar.gz
865f31945c0f1519b4fb0b3401ad54d606c11ba38326eaef2b61d3c5fd9c7972  bitcoin-1155978d8f3f-arm-linux-gnueabihf-debug.tar.gz
5c070025e7335a21cbb6248aa270c90981657666339b186b7d407c46e9c6be89  bitcoin-1155978d8f3f-arm-linux-gnueabihf.tar.gz
8fec4d8bcfab16c0e400bd8bf9e1a1ac8755b6333c97b2423b3ee3bac272a4d7  bitcoin-1155978d8f3f-powerpc64-linux-gnu-debug.tar.gz
c60243bd0dfe803b107b8a65a390cacfe5b5b63fd5b4cb6f8b0f7cdae26eadd8  bitcoin-1155978d8f3f-powerpc64-linux-gnu.tar.gz
0e617819e5c794c37755dcfbef43acc2e77b321bfda9286c264579b41b161d6d  bitcoin-1155978d8f3f-powerpc64le-linux-gnu-debug.tar.gz
fa4a9f4bd556700be54aaede22a7d75952db1519659493fce213fb97a0cafb5b  bitcoin-1155978d8f3f-powerpc64le-linux-gnu.tar.gz
79791ecf185cb42ace36c4bdd7f6fdc390c519fe6b93850ecd659c790142c213  bitcoin-1155978d8f3f-riscv64-linux-gnu-debug.tar.gz
63026c3389db0c2e6d5c1a244afae8ce715f1acc70477f704b1ff52894a1fe68  bitcoin-1155978d8f3f-riscv64-linux-gnu.tar.gz
9c0e483e570285e0e551b442ea1cf858b66f51363c5ba8abb00a85631341e7f5  bitcoin-1155978d8f3f-x86_64-linux-gnu-debug.tar.gz
15c7aefe3dab9b1aaa2d851cbd7f36652f36adc56f69130ab48f6a387e6b5cdf  bitcoin-1155978d8f3f-x86_64-linux-gnu.tar.gz
13ab7d91d5b1f74d0c78eec7a883936b06bfaae588f7b1526fa90217ca8c036d  src/bitcoin-1155978d8f3f.tar.gz
e9ee4bf4b9b4ccec570859ac7acb3e97b6179a18369c482e1eea2771a7a8052a  bitcoin-core-linux-22-res.yml
Done.

Windows

Generating report
cd5c5a76c29e56175232c69a6f10fd52e971648cc13ff8979f31f277072ce714  bitcoin-1155978d8f3f-win-unsigned.tar.gz
6926acdb75d69d53579fde33a488bce2e9c8c57aed70a493ea10d8926c717da3  bitcoin-1155978d8f3f-win64-debug.zip
8f24dc400f14e5f35e3094edf9f5138e70468dff9828b9530f02f35898dc19d0  bitcoin-1155978d8f3f-win64-setup-unsigned.exe
b0244f71bd8877958e8b07e631295d6851d8b3b52e51c6eab2e05cec54722e40  bitcoin-1155978d8f3f-win64.zip
13ab7d91d5b1f74d0c78eec7a883936b06bfaae588f7b1526fa90217ca8c036d  src/bitcoin-1155978d8f3f.tar.gz
a0a679c11578b9132e725a9c24d6253d18b2a2ddb4e2c022ee65406763889e33  bitcoin-core-win-22-res.yml
Done.

macOS

Generating report
006c76657ed2bcd17b39f6c1973c8b00dc0c31c3c2e9799ce4ca1c29518e997b  bitcoin-1155978d8f3f-osx-unsigned.dmg
8523361566c2fcf06d07eeaa58fb6b1bac38e23927ab3c54612e59e9ef17f17f  bitcoin-1155978d8f3f-osx-unsigned.tar.gz
d7b0ab0f32709639ce16725d90adb9bb83c280d9aa4628de3b1cd2b226564524  bitcoin-1155978d8f3f-osx64.tar.gz
13ab7d91d5b1f74d0c78eec7a883936b06bfaae588f7b1526fa90217ca8c036d  src/bitcoin-1155978d8f3f.tar.gz
cdc4a70d5be5767572c1081092b9e3a285e018b2ca89842c5fcb72b3b7ada53d  bitcoin-core-osx-22-res.yml
Done.

hebasto · 2021-06-16T19:34:42Z

@fanquake

Can you demonstrate this in a branch on top of these changes?

See: hebasto:201213-top-DEMO.

CI on Cirrus: https://cirrus-ci.com/build/5900358854639616

The only error is about linking against xcb-shm (see #21376 and #22174), but it is not related to this PR changes directly.

fanquake · 2021-07-18T06:00:25Z

Guix builds:

5bb23a2c9ff259da9516f763afaec4ebef92214bb21d5f8eb4818019e12d19df  guix-build-1155978d8f3f/output/aarch64-linux-gnu/bitcoin-1155978d8f3f-aarch64-linux-gnu-debug.tar.gz
764d717839128d1a5194b48a953ee162248a782d8614a5aa8f498c27460768f1  guix-build-1155978d8f3f/output/aarch64-linux-gnu/bitcoin-1155978d8f3f-aarch64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/aarch64-linux-gnu/inputs.SHA256SUMS
0e3bd95c99ba0da448fd9472044b914170e6b9dc4ac7e2b2c44925b9d69bda24  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/bitcoin-1155978d8f3f-arm-linux-gnueabihf-debug.tar.gz
9d47357c5f17d06299fa8e0185738a824be77b6bf1436f478dc0a6ed82c7b322  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/bitcoin-1155978d8f3f-arm-linux-gnueabihf.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/arm-linux-gnueabihf/inputs.SHA256SUMS
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-1155978d8f3f/output/dist-archive/SKIPATTEST.TAG
13ab7d91d5b1f74d0c78eec7a883936b06bfaae588f7b1526fa90217ca8c036d  guix-build-1155978d8f3f/output/dist-archive/bitcoin-1155978d8f3f.tar.gz
b41233eb7319591fe2cb4e672e043dafdb72b07ee222e7fe9325f1ea017a78ee  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/bitcoin-1155978d8f3f-powerpc64-linux-gnu-debug.tar.gz
567684b9b557faf75995974f1c5ebfd416404041ada78681802b975375a7c28f  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/bitcoin-1155978d8f3f-powerpc64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/powerpc64-linux-gnu/inputs.SHA256SUMS
598dbdea2a7cf0dea53319dfa51a71cafe1704241fb4212627371091a477aacb  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/bitcoin-1155978d8f3f-powerpc64le-linux-gnu-debug.tar.gz
a40d830d088d411a0b11e43fd0df8c0369477494ee3d8dd621d6f81784bcf195  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/bitcoin-1155978d8f3f-powerpc64le-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/powerpc64le-linux-gnu/inputs.SHA256SUMS
dd8591dc616fe54448078cad962704ba226994aa232f65bc3db7312d68eb15c8  guix-build-1155978d8f3f/output/riscv64-linux-gnu/bitcoin-1155978d8f3f-riscv64-linux-gnu-debug.tar.gz
7c63e4f88eee0692ed206cfe8724b50f7ee81844a433f30254a1e7afce16e8c2  guix-build-1155978d8f3f/output/riscv64-linux-gnu/bitcoin-1155978d8f3f-riscv64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/riscv64-linux-gnu/inputs.SHA256SUMS
29c151d971ae7cf1ebaf90a29882f32a777d4221dbc8e1ffb75c87e66301cbbe  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx-unsigned.dmg
335a5f02fed8487635924ffcd8cd60d705b090a31c543e4d5a2adb3538dcf333  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx-unsigned.tar.gz
932925c550c588f5ebff562ee5c495fbe437cd7e2a620aa965ca4f578c5baf1d  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/bitcoin-1155978d8f3f-osx64.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-apple-darwin18/inputs.SHA256SUMS
5e30a07ed4976a6cbe1ca24b3c3e03954c65132a2cdc9d7d6bbc0e3a18521600  guix-build-1155978d8f3f/output/x86_64-linux-gnu/bitcoin-1155978d8f3f-x86_64-linux-gnu-debug.tar.gz
d602eaf5d69bc3c29d28a6540b565cf330d0905fcf365752989757fd5b6d5990  guix-build-1155978d8f3f/output/x86_64-linux-gnu/bitcoin-1155978d8f3f-x86_64-linux-gnu.tar.gz
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-linux-gnu/inputs.SHA256SUMS
c98df448196f382d8b4f0046210535e2ec75cc70161cf248e91f8e75f075de23  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win-unsigned.tar.gz
10a3b9196678ae10229f99bf74a10119c82e665eec21d1c5b77c81ba758803c2  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64-debug.zip
6b2bdd460c6df7ef5dcf149feae5c92056713a6f173bb45737c2c95ccc89efd1  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64-setup-unsigned.exe
7ba0334921fffa8d9989d1d110c0bb106049362f562e5d3bc6e2cdfa642c4084  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/bitcoin-1155978d8f3f-win64.zip
c33129ffcec4e1ced5b21663facc034f08ffcb7e5992ec1e1916e61d2e500a1f  guix-build-1155978d8f3f/output/x86_64-w64-mingw32/inputs.SHA256SUMS

fanquake

ACK 1155978

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

fanquake added the Build system label Dec 13, 2020

This was referenced Dec 13, 2020

Depends : Qt Use Top-Level Structure #20600

Closed

depends: Drop unneeded patches for qt package #20642

Closed

build: use more legible (q)make commands in qt package #20504

Closed

icota reviewed Dec 14, 2020

View reviewed changes

DrahtBot mentioned this pull request Dec 16, 2020

depends: Use more legible qmake commands in qt package #20673

Merged

DrahtBot added the Needs rebase label Dec 25, 2020

hebasto force-pushed the 201213-top branch from 770e40c to b72ff7c Compare December 25, 2020 09:07

DrahtBot removed the Needs rebase label Dec 25, 2020

DrahtBot mentioned this pull request Jan 5, 2021

build: Qt 5.15.x #19716

Closed

DrahtBot mentioned this pull request Mar 6, 2021

depends: Qt 5.12.10 #21376

Merged

DrahtBot added the Needs rebase label Mar 11, 2021

hebasto force-pushed the 201213-top branch from b72ff7c to c1f6c57 Compare June 9, 2021 23:15

fanquake removed the Needs rebase label Jun 9, 2021

This was referenced Jun 10, 2021

build, qt: Fix compiling qt package in depends with GCC 11 #22186

Merged

build: split depends Qt into native and target builds #22142

Closed

hebasto added 6 commits June 15, 2021 21:23

build: Use Qt top-level build facilities

27d3def

build, qt: Add linguist_tools list

39e561e

build, qt: Drop lrelease dependency patch

6a1f98f

It is no longer required after switching to Qt top-level build.

build, qt: Drop translations.pro hack

689320e

It is no longer required after switching to Qt top-level build.

build, qt: Force bootstrap while building linguist tools

3098272

Qt lrelease tool depends on the xml module. This change guarantees that it is always available after being bootstrapped.

build, qt: Fix wrong cross-compiling detection on macOS

763793b

hebasto force-pushed the 201213-top branch from 5ca6e8f to 763793b Compare June 15, 2021 21:21

build, qt: Do not install *.prl files

1155978

hebasto mentioned this pull request Jun 16, 2021

depends: Export variables from make to environment explicitly #19882

Closed

DrahtBot mentioned this pull request Jun 23, 2021

build: Avoid qt-specific @GLIBC_2.28 symbols for compatibility #22321

Closed

hebasto mentioned this pull request Jun 25, 2021

[Linux] Add wayland support #19950

Open

DrahtBot mentioned this pull request Jul 16, 2021

build: Add support for Android NDK r22+ #22469

Closed

fanquake approved these changes Jul 18, 2021

View reviewed changes

fanquake merged commit 4315dc0 into bitcoin:master Jul 18, 2021

hebasto deleted the 201213-top branch July 18, 2021 08:42

hebasto mentioned this pull request Jul 18, 2021

build, qt: Fix cross-compiling detection on M1-based macOS (aarch64) #22487

Closed

kwvg added a commit to kwvg/dash that referenced this pull request Apr 26, 2022

merge bitcoin#20641: Use Qt top-level build facilities

59b9725

gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022

Merge 4315dc0 into merged_master (Bitcoin PR bitcoin/bitcoin#20641)

7cf6e89

bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022

		@@ -0,0 +1,17 @@
		# Create the super cache so modules will add themselves to it.

Conversation

hebasto commented Dec 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BlockMechanic commented Dec 13, 2020

Uh oh!

hebasto commented Dec 13, 2020

Uh oh!

BlockMechanic commented Dec 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

promag commented Dec 13, 2020

Uh oh!

hebasto commented Dec 13, 2020

Uh oh!

BlockMechanic commented Dec 13, 2020

Uh oh!

DrahtBot commented Dec 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

icota Dec 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hebasto Dec 14, 2020

Choose a reason for hiding this comment

Uh oh!

icota Dec 14, 2020

Choose a reason for hiding this comment

Uh oh!

laanwj commented Dec 16, 2020

Uh oh!

hebasto commented Dec 25, 2020

Uh oh!

promag commented Jan 8, 2021

Uh oh!

promag commented Jan 8, 2021

Uh oh!

BlockMechanic commented Jan 9, 2021

Uh oh!

hebasto commented Jan 9, 2021

Uh oh!

BlockMechanic commented Jan 9, 2021

Uh oh!

hebasto commented Jun 15, 2021

Uh oh!

hebasto commented Jun 16, 2021

Guix builds:

Uh oh!

hebasto commented Jun 16, 2021

Gitian builds:

Uh oh!

hebasto commented Jun 16, 2021

Uh oh!

fanquake commented Jul 18, 2021

Uh oh!

fanquake left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

hebasto commented Dec 13, 2020 •

edited

Loading

BlockMechanic commented Dec 13, 2020 •

edited

Loading

DrahtBot commented Dec 13, 2020 •

edited

Loading

icota Dec 14, 2020 •

edited

Loading