Page MenuHomePhabricator

build, qt: backport patches
ClosedPublic

Authored by PiRK on May 24 2023, 12:42.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC28ee03acf3fe: build, qt: backport patches
Summary

This brings us to the same set of patches as the current tip of the Core repository, minus the ones for architectures we don't support (mainly android and arm64 MacOS)

build, qt: Hardcode last modified timestamp in Qt RCC

This change allows the already built qt package to be reused even with
the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds.

build: patch around qt duplicate symbol issue

This is currently causing the same failure in two different PRs:

bash
duplicate symbol 'lcQpaFonts()' in:
    /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
    /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
ld: 1 duplicate symbol for architecture x86_64
bash
x86_64-apple-darwin-ld: error: duplicate symbol: __Z10lcQpaFontsv
>>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
>>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>

depends: modify FastFixedDtoa optimisation flags

This fixes a non-determinism issue in the asm produced for
this function when cross-compiling on x86_64 and aarch64 for
the arm-linux-gnueabihf HOST.

Related to #21194.

guix: More thoroughly control native toolchain

This patch has been updated (line numbers in the diff only) to account for a Qt version bump (D13918)

This is a backport of core#23862, core#24722 and core#25643

and https://github.com/bitcoin/bitcoin/pull/21375/commits/c1ae726a13ecfa5e7e9fdc3030a8110b8bb263f8

Depends on D13926

Test Plan

local crossbuild of qt, gitian builds, guix build

Diff Detail

Repository
rABC Bitcoin ABC
Branch
qt_mk
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 23796
Build 47202: Build Diff
Build 47201: arc lint + arc unit

Event Timeline

@bot gitian-win gitian-linux gitian-osx

@bot gitian-win gitian-linux gitian-osx

Build looks deterministic

WIN
[14:16:03][Step 1/1] bcae8326e5d762b0809ebb0106ef1142242bf473ef8cf9a9faf31b172b32685f  bitcoin-abc-0.27.6-win64-debug.zip
[14:16:03][Step 1/1] c1f7f41c0c4db3e3a1900fdef85324b98253034da9a879a31562b6b46a5beef0  bitcoin-abc-0.27.6-win64-setup-unsigned.exe
[14:16:03][Step 1/1] af0d1f8eeef4e39600075321f72c0cc224ad4a1573dc6c96d547c39aa9a888f6  bitcoin-abc-0.27.6-win64.zip
[14:16:03][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz
[14:16:03][Step 1/1] 1369c17ed0cd49873c630d5bdfd61495c2ce613011312a7ad0815cd0d4c0a7ba  bitcoin-abc-win-res.yml

[13:38:30][Step 1/1] bcae8326e5d762b0809ebb0106ef1142242bf473ef8cf9a9faf31b172b32685f  bitcoin-abc-0.27.6-win64-debug.zip
[13:38:30][Step 1/1] c1f7f41c0c4db3e3a1900fdef85324b98253034da9a879a31562b6b46a5beef0  bitcoin-abc-0.27.6-win64-setup-unsigned.exe
[13:38:30][Step 1/1] af0d1f8eeef4e39600075321f72c0cc224ad4a1573dc6c96d547c39aa9a888f6  bitcoin-abc-0.27.6-win64.zip
[13:38:30][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz
[13:38:30][Step 1/1] 018045731659a4f8138fa8e8e004d9ca5b3dfa9a5db1dadbfe5533ff82b82987  bitcoin-abc-win-res.yml

LINUX
[14:08:15][Step 1/1] 1d70608c403fc3c69d6dcf837a568b84b98270878f015f4732843632fb13d498  bitcoin-abc-0.27.6-aarch64-linux-gnu-debug.tar.gz
[14:08:15][Step 1/1] ea515b233081aaf5d0f771ebe6a9227d7ccbafeaddc6b5e4e6876c284c5a8433  bitcoin-abc-0.27.6-aarch64-linux-gnu.tar.gz
[14:08:15][Step 1/1] d1ba763701d9af169f25ca3c2c55dcd4e16ab6e4a6bbfe7b973d919c413cf2cc  bitcoin-abc-0.27.6-arm-linux-gnueabihf-debug.tar.gz
[14:08:15][Step 1/1] 6272983b1a26b6e32f020d6b6fc1a6741b196bd2fb2e4de910f7f0f232cf4017  bitcoin-abc-0.27.6-arm-linux-gnueabihf.tar.gz
[14:08:15][Step 1/1] 74f52b1faf63a11bb78d7bfe8acc0b3fa6bb8123089ee1800c10249c7b997446  bitcoin-abc-0.27.6-x86_64-linux-gnu-debug.tar.gz
[14:08:15][Step 1/1] ecfd235f26cbb6010a5acff05a677db8fbb12d9e2a4b5fb91810bee56eacde41  bitcoin-abc-0.27.6-x86_64-linux-gnu.tar.gz
[14:08:15][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz

[14:46:09][Step 1/1] 1d70608c403fc3c69d6dcf837a568b84b98270878f015f4732843632fb13d498  bitcoin-abc-0.27.6-aarch64-linux-gnu-debug.tar.gz
[14:46:09][Step 1/1] ea515b233081aaf5d0f771ebe6a9227d7ccbafeaddc6b5e4e6876c284c5a8433  bitcoin-abc-0.27.6-aarch64-linux-gnu.tar.gz
[14:46:09][Step 1/1] d1ba763701d9af169f25ca3c2c55dcd4e16ab6e4a6bbfe7b973d919c413cf2cc  bitcoin-abc-0.27.6-arm-linux-gnueabihf-debug.tar.gz
[14:46:09][Step 1/1] 6272983b1a26b6e32f020d6b6fc1a6741b196bd2fb2e4de910f7f0f232cf4017  bitcoin-abc-0.27.6-arm-linux-gnueabihf.tar.gz
[14:46:09][Step 1/1] 74f52b1faf63a11bb78d7bfe8acc0b3fa6bb8123089ee1800c10249c7b997446  bitcoin-abc-0.27.6-x86_64-linux-gnu-debug.tar.gz
[14:46:09][Step 1/1] ecfd235f26cbb6010a5acff05a677db8fbb12d9e2a4b5fb91810bee56eacde41  bitcoin-abc-0.27.6-x86_64-linux-gnu.tar.gz
[14:46:09][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz

MACOS
[13:55:39][Step 1/1] dddcf1a358af28ec8bf4f3d0556d108f3adec3af494bd22a3a4c363684c8102c  bitcoin-abc-0.27.6-osx-unsigned.dmg
[13:55:39][Step 1/1] 15fb53d6422c295165a2033251edd495fe7b3b5c3c69d9a025cc2974e42b8a46  bitcoin-abc-0.27.6-osx-unsigned.tar.gz
[13:55:39][Step 1/1] 783e565c2636d18daf829634f2b6d36a77ef5746521fb08b3fb747d1ad820b00  bitcoin-abc-0.27.6-osx64.tar.gz
[13:55:39][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz

[14:31:59][Step 1/1] dddcf1a358af28ec8bf4f3d0556d108f3adec3af494bd22a3a4c363684c8102c  bitcoin-abc-0.27.6-osx-unsigned.dmg
[14:31:59][Step 1/1] 15fb53d6422c295165a2033251edd495fe7b3b5c3c69d9a025cc2974e42b8a46  bitcoin-abc-0.27.6-osx-unsigned.tar.gz
[14:31:59][Step 1/1] 783e565c2636d18daf829634f2b6d36a77ef5746521fb08b3fb747d1ad820b00  bitcoin-abc-0.27.6-osx64.tar.gz
[14:31:59][Step 1/1] f44277b1961bf22118179fa43ca9c4efedf6ae5db5eec252660a0654844a77ec  src/bitcoin-abc-0.27.6.tar.gz
PiRK published this revision for review.May 24 2023, 14:56
This revision is now accepted and ready to land.May 24 2023, 19:00

@bot gitian-osx gitian-linux gitian-win

@bot gitian-osx gitian-linux gitian-win