build, qt: Improve Qt static plugins/libs check code #21363

hebasto · 2021-03-04T20:04:32Z

Qt version bump is around the corner (#21376).

As a preparation, this PR makes Qt static plugins/libs check code more correct, and easier to reason about.

configure script log (for HOST=x86_64-pc-linux-gnu):

master (b4d2265):

checking for static Qt plugins: -lqminimal... yes
checking for static Qt plugins: -lqxcb -lxcb-static... yes

this PR:

checking for QMinimalIntegrationPlugin (-lqminimal)... yes
checking for QXcbIntegrationPlugin (-lqxcb -lxcb-static)... yes

hebasto · 2021-03-04T20:04:54Z

cc @fanquake

fanquake

Concept ACK

build-aux/m4/bitcoin_qt.m4

This change puts Q_IMPORT_PLUGIN(...) boilerplate into the macro, which now accepts only one plugin to check, and it is renamed (plural -> singular).

New _BITCOIN_QT_CHECK_STATIC_LIBS name describes the macro functionality more precisely.

Qt static libs reside in libdir.

hebasto · 2021-03-05T07:16:35Z

Updated afcd2dd -> 32b8dc6 (pr21363.01 -> pr21363.02, diff):

addressed @fanquake's comment

hebasto · 2021-03-05T13:54:46Z

Guix builds:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
4d157b2a2e831dd0aecc9fa939832a4001a91835ae562d328471a6d305259157  output/bitcoin-32b8dc648f91-aarch64-linux-gnu-debug.tar.gz
dbaa32f1eab66071fbeec5a63e4074faf98156c7148b3f170f4c3767e58d962f  output/bitcoin-32b8dc648f91-aarch64-linux-gnu.tar.gz
5d04575f614338f54b486fa93abc57737b9116b4bd6a5c059039d96a6b31b6e6  output/bitcoin-32b8dc648f91-arm-linux-gnueabihf-debug.tar.gz
1b5fdf23c33d4578f13ed3e45104c198c849d7db858cf5390a79a5ab3c464969  output/bitcoin-32b8dc648f91-arm-linux-gnueabihf.tar.gz
049cd084b8514d8672e6bcbe3fbd23a685f6d301128e05b53a52eae111bb03e2  output/bitcoin-32b8dc648f91-osx-unsigned.dmg
727cd6a666add475ddadb22d704f36fbe3b0ef44f61d04d93d437c3cb5ec95d2  output/bitcoin-32b8dc648f91-osx-unsigned.tar.gz
74ce193044331a91063b8aa16f07d8edf25e1b3fbdcc36e312d48c45eab3ffe0  output/bitcoin-32b8dc648f91-osx64.tar.gz
45154b45d933377aa3128bfe7ed01f07a8d2813ac942760a730db6c42b006c08  output/bitcoin-32b8dc648f91-powerpc64-linux-gnu-debug.tar.gz
26580c3d434069e93cc91dee940664eecf88b1acb3b18f570c2aa36f020b4665  output/bitcoin-32b8dc648f91-powerpc64-linux-gnu.tar.gz
663da5eaf3c79c5fa76ee601eb031a6706b9fbbd4802d566a5c22d6ea8dd8edb  output/bitcoin-32b8dc648f91-powerpc64le-linux-gnu-debug.tar.gz
cc8352eff62ff6c7bafd0eba21a637f07191e560d0a7a74ebc5fad405c81e998  output/bitcoin-32b8dc648f91-powerpc64le-linux-gnu.tar.gz
dbd7ab94e60ae9ec42620c774ae1d3f46c370547fe3f0af53bdf87ad49c8b2cc  output/bitcoin-32b8dc648f91-riscv64-linux-gnu-debug.tar.gz
be3e17dff65c24ee7a4507872b501bbef1186b07c97c5921b2f84e70a6a7464f  output/bitcoin-32b8dc648f91-riscv64-linux-gnu.tar.gz
a77bb0155c316c925b16cd79dfb82a2b684cd47d27d68cfbf5b83106d8f07c4e  output/bitcoin-32b8dc648f91-win-unsigned.tar.gz
759dff3dd2df36c958e8f815d32fbfbf3b08fb240ce39d2cee155482038f0bb1  output/bitcoin-32b8dc648f91-win64-debug.zip
75212f53b0fb9afb94b19b5e6eb6ad58d0273f36ceb13e740a6794d04ed7babe  output/bitcoin-32b8dc648f91-win64-setup-unsigned.exe
6507480792bd26084b77e0806011f6b9ac6e8514b1a2764d660558241587fb1c  output/bitcoin-32b8dc648f91-win64.zip
05da4a5ffaaed35a84c2d3daf71114d5a84012038a9b05ac23a5a5c345664fe2  output/bitcoin-32b8dc648f91-x86_64-linux-gnu-debug.tar.gz
25278e6e7b17e3fb7fe437ec1fa1aadcd086f38866f07daf01fb40910600cfb3  output/bitcoin-32b8dc648f91-x86_64-linux-gnu.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  output/src/bitcoin-32b8dc648f91.tar.gz

hebasto · 2021-03-05T14:52:34Z

Gitian builds:

Linux

Generating report
8280d955a99fb15d140ede646b8c7a8eb8e8c5436fc9f7e1c543c41540220a1c  bitcoin-32b8dc648f91-aarch64-linux-gnu-debug.tar.gz
ac2677a78ab21992a5b7b6d6b1f09675618325efa993757070c4f93886b7a907  bitcoin-32b8dc648f91-aarch64-linux-gnu.tar.gz
9a3582189ceb0db2d4dd0d69c9b5f0a858f9d3cb530c70a2b7659d7bb823bc3f  bitcoin-32b8dc648f91-arm-linux-gnueabihf-debug.tar.gz
076ca62e157225b7bedfcd8030b5c16429240c7bd49ee5a482b610268012f443  bitcoin-32b8dc648f91-arm-linux-gnueabihf.tar.gz
bef1e95b779ecf4ea02cf203a313b175b3c66f34ab08d67c999f30c8087c74df  bitcoin-32b8dc648f91-powerpc64-linux-gnu-debug.tar.gz
6cf38dd0831873a4bf76386232d774893cee97457faa4d80e121b80652f2241f  bitcoin-32b8dc648f91-powerpc64-linux-gnu.tar.gz
63534cf0fe510a91e51a21c64335b7ff521b5a3d43aa5e5f2303f31a3a62c5d5  bitcoin-32b8dc648f91-powerpc64le-linux-gnu-debug.tar.gz
e98407a07bfcc55f6a42dade484e293ee7592c65d4fc2d29f48fc740c3605b60  bitcoin-32b8dc648f91-powerpc64le-linux-gnu.tar.gz
d42ffccb28f0fd40c3b7a7273ab808652ec6f6ebab5a0e617aee323d125928ba  bitcoin-32b8dc648f91-riscv64-linux-gnu-debug.tar.gz
5b5219f1618ca275fdbe699aed58bab7ed455b0a7bad4b01c658a2ce2670ef16  bitcoin-32b8dc648f91-riscv64-linux-gnu.tar.gz
7f77014a6826c1c328cee7e38bbd8e410c59ed85f0a4f134f8ee91dd1ae70cfd  bitcoin-32b8dc648f91-x86_64-linux-gnu-debug.tar.gz
24a792320811880d073152b2c11ae81efb58e99ed99741eba420ca214ef2a02a  bitcoin-32b8dc648f91-x86_64-linux-gnu.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
ff7e04f7fa1c4dba978a684e9e37a43eda6a2f8f861cf071a5f7baf6d6ffe8dd  bitcoin-core-linux-22-res.yml
Done.

Windows

Generating report
23191cc4aaefc750c184db47aed1ac7764337c485bbb3667ea8002a4d29f232e  bitcoin-32b8dc648f91-win-unsigned.tar.gz
8b9bd0e541c37fb9c079858221247f7e3eda6fce4547ba6462638f53339e1025  bitcoin-32b8dc648f91-win64-debug.zip
ed4a4f2b121689036186579eb2e7ba2d812cac9bdc2dcda1106af6e70fa8a547  bitcoin-32b8dc648f91-win64-setup-unsigned.exe
d82435d9d6317a26733b7f25b45e12c4de7a8310cb0e3cb6208cc5a755bb917e  bitcoin-32b8dc648f91-win64.zip
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
0d4613483c427822df15ce5edc1938624a81669133dea58f6fbb13df4d66100d  bitcoin-core-win-22-res.yml
Done.

macOS

Generating report
a69b7829f6b5ed748ee6648cfa201a8a6088b11872d2b49d752afe2191856aa3  bitcoin-32b8dc648f91-osx-unsigned.dmg
ea27ef00aa9ad102ca5571a1a5de200930fb585b7fbdbdfb0211c85c1590afe3  bitcoin-32b8dc648f91-osx-unsigned.tar.gz
d4c6bc750689bf2e430e4c3a8951881222fa556e84af5c226c96d54a5e919cc3  bitcoin-32b8dc648f91-osx64.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
320da6d3fe5ab7c12d82e4e4fa34e117002f00934c647c01da89f734dc128b07  bitcoin-core-osx-22-res.yml
Done.

fanquake · 2021-03-06T04:28:11Z

Guix builds @ 32b8dc6:

bash-5.1# find output/ -type f -print0 \| env LC_ALL=C sort -z \| xargs -r0 sha256sum
4d157b2a2e831dd0aecc9fa939832a4001a91835ae562d328471a6d305259157  output/bitcoin-32b8dc648f91-aarch64-linux-gnu-debug.tar.gz
dbaa32f1eab66071fbeec5a63e4074faf98156c7148b3f170f4c3767e58d962f  output/bitcoin-32b8dc648f91-aarch64-linux-gnu.tar.gz
5d04575f614338f54b486fa93abc57737b9116b4bd6a5c059039d96a6b31b6e6  output/bitcoin-32b8dc648f91-arm-linux-gnueabihf-debug.tar.gz
1b5fdf23c33d4578f13ed3e45104c198c849d7db858cf5390a79a5ab3c464969  output/bitcoin-32b8dc648f91-arm-linux-gnueabihf.tar.gz
049cd084b8514d8672e6bcbe3fbd23a685f6d301128e05b53a52eae111bb03e2  output/bitcoin-32b8dc648f91-osx-unsigned.dmg
727cd6a666add475ddadb22d704f36fbe3b0ef44f61d04d93d437c3cb5ec95d2  output/bitcoin-32b8dc648f91-osx-unsigned.tar.gz
74ce193044331a91063b8aa16f07d8edf25e1b3fbdcc36e312d48c45eab3ffe0  output/bitcoin-32b8dc648f91-osx64.tar.gz
45154b45d933377aa3128bfe7ed01f07a8d2813ac942760a730db6c42b006c08  output/bitcoin-32b8dc648f91-powerpc64-linux-gnu-debug.tar.gz
26580c3d434069e93cc91dee940664eecf88b1acb3b18f570c2aa36f020b4665  output/bitcoin-32b8dc648f91-powerpc64-linux-gnu.tar.gz
663da5eaf3c79c5fa76ee601eb031a6706b9fbbd4802d566a5c22d6ea8dd8edb  output/bitcoin-32b8dc648f91-powerpc64le-linux-gnu-debug.tar.gz
cc8352eff62ff6c7bafd0eba21a637f07191e560d0a7a74ebc5fad405c81e998  output/bitcoin-32b8dc648f91-powerpc64le-linux-gnu.tar.gz
dbd7ab94e60ae9ec42620c774ae1d3f46c370547fe3f0af53bdf87ad49c8b2cc  output/bitcoin-32b8dc648f91-riscv64-linux-gnu-debug.tar.gz
be3e17dff65c24ee7a4507872b501bbef1186b07c97c5921b2f84e70a6a7464f  output/bitcoin-32b8dc648f91-riscv64-linux-gnu.tar.gz
a77bb0155c316c925b16cd79dfb82a2b684cd47d27d68cfbf5b83106d8f07c4e  output/bitcoin-32b8dc648f91-win-unsigned.tar.gz
759dff3dd2df36c958e8f815d32fbfbf3b08fb240ce39d2cee155482038f0bb1  output/bitcoin-32b8dc648f91-win64-debug.zip
75212f53b0fb9afb94b19b5e6eb6ad58d0273f36ceb13e740a6794d04ed7babe  output/bitcoin-32b8dc648f91-win64-setup-unsigned.exe
6507480792bd26084b77e0806011f6b9ac6e8514b1a2764d660558241587fb1c  output/bitcoin-32b8dc648f91-win64.zip
05da4a5ffaaed35a84c2d3daf71114d5a84012038a9b05ac23a5a5c345664fe2  output/bitcoin-32b8dc648f91-x86_64-linux-gnu-debug.tar.gz
25278e6e7b17e3fb7fe437ec1fa1aadcd086f38866f07daf01fb40910600cfb3  output/bitcoin-32b8dc648f91-x86_64-linux-gnu.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  output/src/bitcoin-32b8dc648f91.tar.gz

DrahtBot · 2021-03-06T08:16:06Z

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

depends: Qt 5.12.10 #21376 (depends: Qt 5.12.10 by fanquake)

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.

hebasto · 2021-03-06T13:19:25Z

build-aux/m4/bitcoin_qt.m4

      AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
    elif test "x$TARGET_OS" = xlinux; then
-      _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
+      _BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb -lxcb-static])


-lxcb-static is redundant here and it could be dropped, as it is linked with Qt5XcbQpas flags.

Lets leave that for a separate change post #21376.

@fanquake you are right

DrahtBot · 2021-03-08T03:16:38Z

Guix builds

File	commit `48725e6` (master)	commit `71bf017` (master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`c0874d1b330fbefe...`	`ddcef1c6e7ef1f13...`
*-aarch64-linux-gnu.tar.gz	`aa5812a46cdb9b17...`	`c728e671b84df637...`
*-arm-linux-gnueabihf-debug.tar.gz	`829d64e019d44cdb...`	`2d2ed6a13a0c73f7...`
*-arm-linux-gnueabihf.tar.gz	`bfe6daf32d21c1ba...`	`bc9013f699314d4a...`
*-osx-unsigned.dmg	`994a38a15423c943...`	`8e5116934bcdbab3...`
*-osx-unsigned.tar.gz	`b8ba9767e95854c3...`	`3a3fbbafd154e011...`
*-osx64.tar.gz	`e40a6c3d367faac0...`	`5116c5c1cb1970a2...`
*-powerpc64-linux-gnu-debug.tar.gz	`e578666d86258fba...`	`8eb7fd36efee3a21...`
*-powerpc64-linux-gnu.tar.gz	`25cf822c602f666c...`	`8173a418171cce71...`
*-powerpc64le-linux-gnu-debug.tar.gz	`ecc42f86e8f789f1...`	`fc20517c572ebaf1...`
*-powerpc64le-linux-gnu.tar.gz	`54550694128472dc...`	`156cdefec6834f63...`
*-riscv64-linux-gnu-debug.tar.gz	`a47b303965bb52bf...`	`9a7a9c7bc20b9d6f...`
*-riscv64-linux-gnu.tar.gz	`fa622fe7877da0bf...`	`32ac48c739a40510...`
*-win-unsigned.tar.gz	`2c86f79a791858e3...`	`7aef45295e4e2b49...`
*-win64-debug.zip	`49435c78f11fb3c8...`	`001fd8569ba2eeb8...`
*-win64-setup-unsigned.exe	`0e76b2d89273a43e...`	`e1639b47f499de9d...`
*-win64.zip	`d5c10f3570fa1003...`	`80c3b5e3d6f0af1d...`
*-x86_64-linux-gnu-debug.tar.gz	`fc1699b9ca5f0d2c...`	`9ac087258463a798...`
*-x86_64-linux-gnu.tar.gz	`92f5688dc334ea8e...`	`79349031c5487f81...`
*.tar.gz	`ff440483a5453fd3...`	`90a1d3a73380ae61...`
guix_build.log	`2070abe8ac15129b...`	`338dd7de3d5c58ca...`
guix_build.log.diff		`333f9d00ca20dd7e...`

fanquake

ACK 32b8dc6

Also ran gitian builds:

# macOS:
Generating report
a69b7829f6b5ed748ee6648cfa201a8a6088b11872d2b49d752afe2191856aa3  bitcoin-32b8dc648f91-osx-unsigned.dmg
ea27ef00aa9ad102ca5571a1a5de200930fb585b7fbdbdfb0211c85c1590afe3  bitcoin-32b8dc648f91-osx-unsigned.tar.gz
d4c6bc750689bf2e430e4c3a8951881222fa556e84af5c226c96d54a5e919cc3  bitcoin-32b8dc648f91-osx64.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
a45037c6a302ce6cfcfc0a98df7b25a04f284353b14d950d302d9fb8479ccbd6  bitcoin-core-osx-22-res.yml
Done.

# Windows:
Generating report
23191cc4aaefc750c184db47aed1ac7764337c485bbb3667ea8002a4d29f232e  bitcoin-32b8dc648f91-win-unsigned.tar.gz
8b9bd0e541c37fb9c079858221247f7e3eda6fce4547ba6462638f53339e1025  bitcoin-32b8dc648f91-win64-debug.zip
ed4a4f2b121689036186579eb2e7ba2d812cac9bdc2dcda1106af6e70fa8a547  bitcoin-32b8dc648f91-win64-setup-unsigned.exe
d82435d9d6317a26733b7f25b45e12c4de7a8310cb0e3cb6208cc5a755bb917e  bitcoin-32b8dc648f91-win64.zip
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
1782027aba7459c78330ebf638046ed107f1f863ad56994c2a5967a73226c560  bitcoin-core-win-22-res.yml
Done.

# Linux:
Generating report
8280d955a99fb15d140ede646b8c7a8eb8e8c5436fc9f7e1c543c41540220a1c  bitcoin-32b8dc648f91-aarch64-linux-gnu-debug.tar.gz
ac2677a78ab21992a5b7b6d6b1f09675618325efa993757070c4f93886b7a907  bitcoin-32b8dc648f91-aarch64-linux-gnu.tar.gz
9a3582189ceb0db2d4dd0d69c9b5f0a858f9d3cb530c70a2b7659d7bb823bc3f  bitcoin-32b8dc648f91-arm-linux-gnueabihf-debug.tar.gz
076ca62e157225b7bedfcd8030b5c16429240c7bd49ee5a482b610268012f443  bitcoin-32b8dc648f91-arm-linux-gnueabihf.tar.gz
bef1e95b779ecf4ea02cf203a313b175b3c66f34ab08d67c999f30c8087c74df  bitcoin-32b8dc648f91-powerpc64-linux-gnu-debug.tar.gz
6cf38dd0831873a4bf76386232d774893cee97457faa4d80e121b80652f2241f  bitcoin-32b8dc648f91-powerpc64-linux-gnu.tar.gz
63534cf0fe510a91e51a21c64335b7ff521b5a3d43aa5e5f2303f31a3a62c5d5  bitcoin-32b8dc648f91-powerpc64le-linux-gnu-debug.tar.gz
e98407a07bfcc55f6a42dade484e293ee7592c65d4fc2d29f48fc740c3605b60  bitcoin-32b8dc648f91-powerpc64le-linux-gnu.tar.gz
d42ffccb28f0fd40c3b7a7273ab808652ec6f6ebab5a0e617aee323d125928ba  bitcoin-32b8dc648f91-riscv64-linux-gnu-debug.tar.gz
5b5219f1618ca275fdbe699aed58bab7ed455b0a7bad4b01c658a2ce2670ef16  bitcoin-32b8dc648f91-riscv64-linux-gnu.tar.gz
7f77014a6826c1c328cee7e38bbd8e410c59ed85f0a4f134f8ee91dd1ae70cfd  bitcoin-32b8dc648f91-x86_64-linux-gnu-debug.tar.gz
24a792320811880d073152b2c11ae81efb58e99ed99741eba420ca214ef2a02a  bitcoin-32b8dc648f91-x86_64-linux-gnu.tar.gz
6274fd0ab5e108bcd18dd08a04f7cd916a72959fac12a2ae088fb714757ca347  src/bitcoin-32b8dc648f91.tar.gz
70fb3daeda27719d4f84dc26f9ead9516aa86219196d9a54a9e334f90a100be8  bitcoin-core-linux-22-res.yml
Done.

…code

Due to the ill-formed code _BITCOIN_QT_CHECK_STATIC_PLUGIN never fails.

ffdd7de build, qt: Fix regression introduced in #21363 (Hennadii Stepanov) Pull request description: After #21363 the `_BITCOIN_QT_CHECK_STATIC_PLUGIN` never fails due to the ill-formed code. Sorry for breaking it. ACKs for top commit: fanquake: ACK ffdd7de Tree-SHA512: 0af3334af5332f3b349dba219565ee336090541c2c4fae53d7dc4dd2aa05291b3c7c13bfc506219f642fb854f3c887f0f9621b42d0df68d5d794e0563b2cf5d4

ffdd7de build, qt: Fix regression introduced in bitcoin#21363 (Hennadii Stepanov) Pull request description: After bitcoin#21363 the `_BITCOIN_QT_CHECK_STATIC_PLUGIN` never fails due to the ill-formed code. Sorry for breaking it. ACKs for top commit: fanquake: ACK ffdd7de Tree-SHA512: 0af3334af5332f3b349dba219565ee336090541c2c4fae53d7dc4dd2aa05291b3c7c13bfc506219f642fb854f3c887f0f9621b42d0df68d5d794e0563b2cf5d4

550ed1b build: update qt qpaint non determinism patch for 5.12.10 (fanquake) 6093ae4 build: update qt no-xlib patch for 5.12.10 (fanquake) 84928c4 build: update qt android jni static patch for 5.12.10 (fanquake) cc6f47d build: update qt lrelease patch for 5.12.10 (fanquake) 286d07f build, qt: Fix lib paths in *.pc files (Hennadii Stepanov) fa5e97e build: disable qt SDK version checking (fanquake) 1be8e0f build: Add QMacStyle support (Hennadii Stepanov) e674e94 build: revert to using Qts internal zlib (fanquake) 06cd0da build: qt 5.12.10 (fanquake) 3272e34 build: Add xkbcommon 0.8.4 (Hennadii Stepanov) d769b33 build: only pass -optimized-tools to qt in debug mode (fanquake) Pull request description: Switch to Qt 5.12.10 in depends. Based on #21363. This is a much smaller changeset, and should be easier to review than #19716. Also postpones needing to bring a bunch of new libs into depends. Big thanks to Hebasto that has been helping with this. ACKs for top commit: laanwj: Code review ACK 550ed1b hebasto: ACK 550ed1b jarolrod: ACK 550ed1b , tested on macOS 11.2 built from depends Tree-SHA512: cb6b70f5a5372ba0b64f7ddfa696eda0411922cd261c67bfa2d9332c685a7b358ab18e5cfaa677b414ae8ad78296bba6ed0eecd071fdacdf736a0d030f679fe5

e67c012 doc: Update dependencies.md with a new Qt version (Hennadii Stepanov) cc25f89 build: Cleanup libxkbcommon_postprocess_cmds (Hennadii Stepanov) 72fc043 build, qt: Drop redundant -lxcb-static flag (Hennadii Stepanov) cba4a7e build, qt: Always test plugins/subdir before adding to search paths (Hennadii Stepanov) Pull request description: 1) Always test `plugins/subdir` before adding to search paths as the existence of each subdir is not guaranteed for all platforms: - bitcoin/bitcoin#21376 (comment) 2) Drop redundant `-lxcb-static` flag as it has been already linked with `Qt5XcbQpa`: - bitcoin/bitcoin#21363 (comment) 3) Cleanup `libxkbcommon_postprocess_cmds` as there is no `share/` directory in the staging one: - bitcoin/bitcoin#21376 (comment) - bitcoin/bitcoin#21376 (comment) 4) Update `dependencies.md` ACKs for top commit: fanquake: ACK e67c012 Tree-SHA512: 9113ee97d5e7424290778154d62a68af804ee82efedbbe9776a7f692104d65b07d151e9f7f1f98ec08d18f6d63efef3e44b207bee67ad913f5dbc4eddbb8ea41

merge bitcoin#16110, bitcoin#16413, bitcoin#16837, bitcoin#17466, bitcoin#19959, bitcoin#19867, bitcoin#20447, bitcoin#21363, partial bitcoin#17730: bump qt

ffdd7de build, qt: Fix regression introduced in bitcoin#21363 (Hennadii Stepanov) Pull request description: After bitcoin#21363 the `_BITCOIN_QT_CHECK_STATIC_PLUGIN` never fails due to the ill-formed code. Sorry for breaking it. ACKs for top commit: fanquake: ACK ffdd7de Tree-SHA512: 0af3334af5332f3b349dba219565ee336090541c2c4fae53d7dc4dd2aa05291b3c7c13bfc506219f642fb854f3c887f0f9621b42d0df68d5d794e0563b2cf5d4

hebasto added the Build system label Mar 4, 2021

fanquake reviewed Mar 5, 2021

View reviewed changes

build-aux/m4/bitcoin_qt.m4 Outdated Show resolved Hide resolved

hebasto added 4 commits March 5, 2021 09:10

build, qt: Refactor internal _BITCOIN_QT_CHECK_STATIC_PLUGINS macro

bf24774

This change puts Q_IMPORT_PLUGIN(...) boilerplate into the macro, which now accepts only one plugin to check, and it is renamed (plural -> singular).

build, refactor: Rename internal _BITCOIN_QT_FIND_STATIC_PLUGINS macro

6203457

New _BITCOIN_QT_CHECK_STATIC_LIBS name describes the macro functionality more precisely.

build, qt: Make Qt static libs check regardless of plugindir

57b6522

Qt static libs reside in libdir.

build, refactor: Fix indentation

32b8dc6

hebasto force-pushed the 210304-qt branch from afcd2dd to 32b8dc6 Compare March 5, 2021 07:12

maflcko added Needs gitian build DrahtBot Guix build requested labels Mar 5, 2021

fanquake mentioned this pull request Mar 6, 2021

depends: Qt 5.12.10 #21376

Merged

hebasto commented Mar 6, 2021

View reviewed changes

DrahtBot removed the DrahtBot Guix build requested label Mar 8, 2021

fanquake approved these changes Mar 9, 2021

View reviewed changes

fanquake merged commit 738fc4a into bitcoin:master Mar 9, 2021

maflcko removed the Needs gitian build label Mar 9, 2021

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 9, 2021

Merge bitcoin#21363: build, qt: Improve Qt static plugins/libs check …

32050fa

…code

hebasto added a commit to hebasto/bitcoin that referenced this pull request Mar 9, 2021

build, qt: Fix regression introduced in bitcoin#21363

ffdd7de

Due to the ill-formed code _BITCOIN_QT_CHECK_STATIC_PLUGIN never fails.

hebasto mentioned this pull request Mar 9, 2021

build: Fix regression introduced in #21363 #21400

Merged

hebasto mentioned this pull request Mar 12, 2021

build: Cleanups and follow ups after bumping Qt to 5.12.10 #21423

Merged

hebasto deleted the 210304-qt branch March 30, 2021 23:27

kwvg added a commit to kwvg/dash that referenced this pull request Nov 24, 2021

merge bitcoin#21363: Improve Qt static plugins/libs check code

464bf3f

kwvg added a commit to kwvg/dash that referenced this pull request Nov 30, 2021

merge bitcoin#21363: Improve Qt static plugins/libs check code

0f062c3

gades pushed a commit to cosanta/cosanta-core that referenced this pull request May 24, 2022

merge bitcoin#21363: Improve Qt static plugins/libs check code

53eaf37

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build, qt: Improve Qt static plugins/libs check code #21363

build, qt: Improve Qt static plugins/libs check code #21363

hebasto commented Mar 4, 2021 •

edited by fanquake

Loading

hebasto commented Mar 4, 2021

fanquake left a comment

hebasto commented Mar 5, 2021 •

edited

Loading

hebasto commented Mar 5, 2021

hebasto commented Mar 5, 2021

fanquake commented Mar 6, 2021

DrahtBot commented Mar 6, 2021

hebasto Mar 6, 2021

fanquake Mar 8, 2021

hebasto Mar 8, 2021 •

edited

Loading

DrahtBot commented Mar 8, 2021

fanquake left a comment

build, qt: Improve Qt static plugins/libs check code #21363

build, qt: Improve Qt static plugins/libs check code #21363

Conversation

hebasto commented Mar 4, 2021 • edited by fanquake Loading

hebasto commented Mar 4, 2021

fanquake left a comment

Choose a reason for hiding this comment

hebasto commented Mar 5, 2021 • edited Loading

hebasto commented Mar 5, 2021

hebasto commented Mar 5, 2021

fanquake commented Mar 6, 2021

DrahtBot commented Mar 6, 2021

Conflicts

hebasto Mar 6, 2021

Choose a reason for hiding this comment

fanquake Mar 8, 2021

Choose a reason for hiding this comment

hebasto Mar 8, 2021 • edited Loading

Choose a reason for hiding this comment

DrahtBot commented Mar 8, 2021

Guix builds

fanquake left a comment

Choose a reason for hiding this comment

hebasto commented Mar 4, 2021 •

edited by fanquake

Loading

hebasto commented Mar 5, 2021 •

edited

Loading

hebasto Mar 8, 2021 •

edited

Loading