Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC36d57557f4bd: depends: Qt 5.12.11

Summary

depends: -optimized-qmake is now -optimized-tools

https://github.com/bitcoin/bitcoin/pull/17730/commits/29d56c62b7f206d42f0908819ff2e1926737f988

build: only pass -optimized-tools to qt in debug mode

Qt's configure tells us that "-optimized-tools is not useful in -release
mode.", so don't use it there.

https://github.com/bitcoin/bitcoin/pull/21376/commits/d769b3372d9833224a5151000ab99048474f8051

build: Add xkbcommon 0.8.4

Co-authored-by: fanquake <fanquake@gmail.com>

https://github.com/bitcoin/bitcoin/pull/21376/commits/3272e34f9c548f7e4570d786fd322947e3cf20c6

build: qt 5.12.10

remove fix_configure_mac.patch
Fixed upstream: https://bugreports.qt.io/browse/QTBUG-67286

remove fix_rcc_determinism.patch
Fixed upstream in https://bugreports.qt.io/browse/QTBUG-62511

remove freetype_back_compat.patch
By the time we ship a release with Qt 5.12, we'll certainly no-longer be
supporting Ubuntu 14.04 and Ubuntu 16.04 ships with FreeType 2.6.1,
which is new enough that using the symbol is no-longer an issue.
The renaming of FT_Get_X11_Font_Format() happened in FreeType 2.6

remove xkb-default.patch
This was removed upstream in d5abf545971da717014d316127045fc19edbcd65

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

https://github.com/bitcoin/bitcoin/pull/21376/commits/06cd0da21fc14360e10204affe240b72715a0267

Note: the backport of this commit bypasses some intermediate work on fix_qt_pkgconfig.patch (first commit in core#18291)

build: revert to using Qts internal zlib

https://github.com/bitcoin/bitcoin/pull/21376/commits/e674e94302dec9933006dde1c18f01a1d4b77d8e

build: Add QMacStyle support

https://github.com/bitcoin/bitcoin/pull/21376/commits/1be8e0f2388e243d310fe7eeb46149a690de4ddf

build: disable qt SDK version checking

This tries to invoke xcrun, which is not available when cross-compiling.
Given we are in control of the SDK versions being used, removing this
check has minimal-no effect.

https://github.com/bitcoin/bitcoin/pull/21376/commits/fa5e97e8c2cf93b7afc0d6b0c460700ec18d18f2

build, qt: Fix lib paths in *.pc files

See:

QTBUG-72903, commit 9864d2c6f3b628ca9f07a56b197e77bd43931cca

QTBUG-78873, commit e55a61a77f0c87c05661a0335dfdb12673c6a27f

Could be dropped for Qt 5.14+.

https://github.com/bitcoin/bitcoin/pull/21376/commits/286d07ff1778971d7df456cc18a91db813c1a028

build: update qt lrelease patch for 5.12.10

https://github.com/bitcoin/bitcoin/pull/21376/commits/cc6f47d51a0b3a1bb95a1f2a1b67a6d47cfcaa11

build: update qt no-xlib patch for 5.12.10

https://github.com/bitcoin/bitcoin/pull/21376/commits/6093ae4d30bd3d888eccc4d6cb1c3c1efb7f13fd

Qt 5.12.11:

fixes macOS related QTBUG-87014, and the fix_bigsur_drawing.patch (which is our workaround for QTBUG-87014) could be dropped

upgrades supported macOS SDK to 11.0, and removes related warnings

fxes tab widget rendering on macOS Big Sur

core#22054

build, qt: No longer need to set QT_RCC_TEST=1 for determinism

Since Qt 5.3.1 hash seeding is disabled for rcc.
See commit 5283a6c87beac5a43f612786fefd6e43f2c70bf6.

core#21655

Notes:

Openssl had to be bumped to 1.1 for Qt >= 5.12.4. The patch for TERMIOS added in D5651 is no longer necessary, the patches for deterministic builds needs a minor change because now DATE needs to be defined, many configure options have been dropped by OpenSSL.
Some of this OpenSSL bumping work is from https://gitlab.com/bitcoin-cash-node/bitcoin-cash-node/-/merge_requests/1523:
Additional patches are necessary for missing numeric includes for this version of Qt (follow-up to D13722)

This is a backport of core#21376, core#22054 and core#21655

Test Plan

gitian builds

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 23545
Build 46708: Build Diff	lint-circular-dependencies · build-without-wallet · build-debug · build-diff · build-clang · build-clang-tidy
Build 46707: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

teamcity updated a token.Apr 13 2023, 11:28

Build Bitcoin ABC Diffs / Diff Testing (gitian-linux) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39393 -> phabricator/diff/39393
 * [new tag]             phabricator/diff/39420 -> phabricator/diff/39420
 * [new tag]             phabricator/diff/39421 -> phabricator/diff/39421
 * [new tag]             phabricator/diff/39422 -> phabricator/diff/39422
 * [new tag]             phabricator/diff/39429 -> phabricator/diff/39429
 * [new tag]             phabricator/diff/39433 -> phabricator/diff/39433
 * [new tag]             phabricator/diff/39523 -> phabricator/diff/39523
 * [new tag]             phabricator/diff/39525 -> phabricator/diff/39525
 * [new tag]             phabricator/diff/39531 -> phabricator/diff/39531
 * [new tag]             phabricator/diff/39533 -> phabricator/diff/39533
 * [new tag]             phabricator/diff/39536 -> phabricator/diff/39536
 * [new tag]             phabricator/diff/39547 -> phabricator/diff/39547
 * [new tag]             phabricator/diff/39554 -> phabricator/diff/39554
 * [new tag]             phabricator/diff/39557 -> phabricator/diff/39557
 * [new tag]             phabricator/diff/39560 -> phabricator/diff/39560
 * [new tag]             phabricator/diff/39579 -> phabricator/diff/39579
 * [new tag]             phabricator/diff/39580 -> phabricator/diff/39580
 * [new tag]             phabricator/diff/39581 -> phabricator/diff/39581
 * [new tag]             phabricator/diff/39585 -> phabricator/diff/39585
 * [new tag]             phabricator/diff/39590 -> phabricator/diff/39590
 * [new tag]             phabricator/diff/39592 -> phabricator/diff/39592
 * [new tag]             phabricator/diff/39601 -> phabricator/diff/39601
 * [new tag]             phabricator/diff/39625 -> phabricator/diff/39625
 * [new tag]             phabricator/diff/39626 -> phabricator/diff/39626
 * [new tag]             phabricator/diff/39631 -> phabricator/diff/39631
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39649 -> phabricator/diff/39649
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39656 -> phabricator/diff/39656
 * [new tag]             phabricator/diff/39660 -> phabricator/diff/39660
 * [new tag]             phabricator/diff/39666 -> phabricator/diff/39666
 * [new tag]             phabricator/diff/39667 -> phabricator/diff/39667
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-linux failed with exit code 1

changes to OpenSSL bumping: use version 1.1.1n, disable more stuff, update the way we fix determinism (patch DATE in copyright headers)

@bot gitian-linux

teamcity updated a token.Apr 14 2023, 13:54

Build Bitcoin ABC Diffs / Diff Testing (gitian-linux) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39549 -> phabricator/diff/39549
 * [new tag]             phabricator/diff/39551 -> phabricator/diff/39551
 * [new tag]             phabricator/diff/39561 -> phabricator/diff/39561
 * [new tag]             phabricator/diff/39568 -> phabricator/diff/39568
 * [new tag]             phabricator/diff/39574 -> phabricator/diff/39574
 * [new tag]             phabricator/diff/39585 -> phabricator/diff/39585
 * [new tag]             phabricator/diff/39587 -> phabricator/diff/39587
 * [new tag]             phabricator/diff/39589 -> phabricator/diff/39589
 * [new tag]             phabricator/diff/39590 -> phabricator/diff/39590
 * [new tag]             phabricator/diff/39601 -> phabricator/diff/39601
 * [new tag]             phabricator/diff/39622 -> phabricator/diff/39622
 * [new tag]             phabricator/diff/39626 -> phabricator/diff/39626
 * [new tag]             phabricator/diff/39628 -> phabricator/diff/39628
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39633 -> phabricator/diff/39633
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39642 -> phabricator/diff/39642
 * [new tag]             phabricator/diff/39645 -> phabricator/diff/39645
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39660 -> phabricator/diff/39660
 * [new tag]             phabricator/diff/39662 -> phabricator/diff/39662
 * [new tag]             phabricator/diff/39666 -> phabricator/diff/39666
 * [new tag]             phabricator/diff/39672 -> phabricator/diff/39672
 * [new tag]             phabricator/diff/39682 -> phabricator/diff/39682
 * [new tag]             phabricator/diff/39685 -> phabricator/diff/39685
 * [new tag]             phabricator/diff/39686 -> phabricator/diff/39686
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39719 -> phabricator/diff/39719
 * [new tag]             phabricator/diff/39720 -> phabricator/diff/39720
 * [new tag]             phabricator/diff/39721 -> phabricator/diff/39721
 * [new tag]             phabricator/diff/39723 -> phabricator/diff/39723
 * [new tag]             phabricator/diff/39740 -> phabricator/diff/39740
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-linux failed with exit code 1

add OPENSSL_LIBS= for mingw32 and linux (https://gitlab.com/bitcoin-cash-node/bitcoin-cash-node/-/merge_requests/1523)

@bot gitian-linux

teamcity updated a token.Apr 14 2023, 14:45

Harbormaster completed remote builds in B23318: Diff 39740.Apr 14 2023, 14:46

@bot gitian-linux

teamcity updated a token.Apr 14 2023, 14:48

Build Bitcoin ABC Diffs / Diff Testing (gitian-linux) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39393 -> phabricator/diff/39393
 * [new tag]             phabricator/diff/39401 -> phabricator/diff/39401
 * [new tag]             phabricator/diff/39402 -> phabricator/diff/39402
 * [new tag]             phabricator/diff/39419 -> phabricator/diff/39419
 * [new tag]             phabricator/diff/39420 -> phabricator/diff/39420
 * [new tag]             phabricator/diff/39421 -> phabricator/diff/39421
 * [new tag]             phabricator/diff/39431 -> phabricator/diff/39431
 * [new tag]             phabricator/diff/39437 -> phabricator/diff/39437
 * [new tag]             phabricator/diff/39459 -> phabricator/diff/39459
 * [new tag]             phabricator/diff/39460 -> phabricator/diff/39460
 * [new tag]             phabricator/diff/39523 -> phabricator/diff/39523
 * [new tag]             phabricator/diff/39531 -> phabricator/diff/39531
 * [new tag]             phabricator/diff/39533 -> phabricator/diff/39533
 * [new tag]             phabricator/diff/39538 -> phabricator/diff/39538
 * [new tag]             phabricator/diff/39554 -> phabricator/diff/39554
 * [new tag]             phabricator/diff/39555 -> phabricator/diff/39555
 * [new tag]             phabricator/diff/39585 -> phabricator/diff/39585
 * [new tag]             phabricator/diff/39621 -> phabricator/diff/39621
 * [new tag]             phabricator/diff/39628 -> phabricator/diff/39628
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39667 -> phabricator/diff/39667
 * [new tag]             phabricator/diff/39682 -> phabricator/diff/39682
 * [new tag]             phabricator/diff/39685 -> phabricator/diff/39685
 * [new tag]             phabricator/diff/39689 -> phabricator/diff/39689
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39703 -> phabricator/diff/39703
 * [new tag]             phabricator/diff/39705 -> phabricator/diff/39705
 * [new tag]             phabricator/diff/39731 -> phabricator/diff/39731
 * [new tag]             phabricator/diff/39740 -> phabricator/diff/39740
 * [new tag]             phabricator/diff/39747 -> phabricator/diff/39747
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-linux failed with exit code 1

Harbormaster completed remote builds in B23322: Diff 39747.Apr 14 2023, 15:14

fix additional missing #include <numeric> instances; additional fixes for OpenSSL

@bot gitian-linux

teamcity updated a token.Apr 17 2023, 10:20

Harbormaster completed remote builds in B23345: Diff 39783.Apr 17 2023, 10:42

Build Bitcoin ABC Diffs / Diff Testing (gitian-linux) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39437 -> phabricator/diff/39437
 * [new tag]             phabricator/diff/39459 -> phabricator/diff/39459
 * [new tag]             phabricator/diff/39460 -> phabricator/diff/39460
 * [new tag]             phabricator/diff/39523 -> phabricator/diff/39523
 * [new tag]             phabricator/diff/39531 -> phabricator/diff/39531
 * [new tag]             phabricator/diff/39533 -> phabricator/diff/39533
 * [new tag]             phabricator/diff/39538 -> phabricator/diff/39538
 * [new tag]             phabricator/diff/39554 -> phabricator/diff/39554
 * [new tag]             phabricator/diff/39555 -> phabricator/diff/39555
 * [new tag]             phabricator/diff/39585 -> phabricator/diff/39585
 * [new tag]             phabricator/diff/39621 -> phabricator/diff/39621
 * [new tag]             phabricator/diff/39628 -> phabricator/diff/39628
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39667 -> phabricator/diff/39667
 * [new tag]             phabricator/diff/39682 -> phabricator/diff/39682
 * [new tag]             phabricator/diff/39685 -> phabricator/diff/39685
 * [new tag]             phabricator/diff/39689 -> phabricator/diff/39689
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39703 -> phabricator/diff/39703
 * [new tag]             phabricator/diff/39705 -> phabricator/diff/39705
 * [new tag]             phabricator/diff/39731 -> phabricator/diff/39731
 * [new tag]             phabricator/diff/39740 -> phabricator/diff/39740
 * [new tag]             phabricator/diff/39747 -> phabricator/diff/39747
 * [new tag]             phabricator/diff/39753 -> phabricator/diff/39753
 * [new tag]             phabricator/diff/39764 -> phabricator/diff/39764
 * [new tag]             phabricator/diff/39765 -> phabricator/diff/39765
 * [new tag]             phabricator/diff/39775 -> phabricator/diff/39775
 * [new tag]             phabricator/diff/39778 -> phabricator/diff/39778
 * [new tag]             phabricator/diff/39780 -> phabricator/diff/39780
 * [new tag]             phabricator/diff/39783 -> phabricator/diff/39783
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-linux failed with exit code 1

squash with https://gitlab.com/bitcoin-cash-node/bitcoin-cash-node/-/merge_requests/1523/diffs?commit_id=04c78731c6a28524fa5898642e0bb9fbc93733ca

@bot gitian-linux

teamcity updated a token.Apr 17 2023, 14:51

PiRK added a child revision: D13732: depends: Bump Qt version to 5.12.11.Apr 17 2023, 14:57

Harbormaster completed remote builds in B23346: Diff 39784.Apr 17 2023, 15:17

@bot gitian-win gitian-osx

teamcity updated a token.Apr 17 2023, 16:20

Build Bitcoin ABC Diffs / Diff Testing (gitian-win) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39590 -> phabricator/diff/39590
 * [new tag]             phabricator/diff/39601 -> phabricator/diff/39601
 * [new tag]             phabricator/diff/39621 -> phabricator/diff/39621
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39633 -> phabricator/diff/39633
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39649 -> phabricator/diff/39649
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39658 -> phabricator/diff/39658
 * [new tag]             phabricator/diff/39660 -> phabricator/diff/39660
 * [new tag]             phabricator/diff/39666 -> phabricator/diff/39666
 * [new tag]             phabricator/diff/39667 -> phabricator/diff/39667
 * [new tag]             phabricator/diff/39682 -> phabricator/diff/39682
 * [new tag]             phabricator/diff/39689 -> phabricator/diff/39689
 * [new tag]             phabricator/diff/39691 -> phabricator/diff/39691
 * [new tag]             phabricator/diff/39696 -> phabricator/diff/39696
 * [new tag]             phabricator/diff/39698 -> phabricator/diff/39698
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39703 -> phabricator/diff/39703
 * [new tag]             phabricator/diff/39722 -> phabricator/diff/39722
 * [new tag]             phabricator/diff/39725 -> phabricator/diff/39725
 * [new tag]             phabricator/diff/39726 -> phabricator/diff/39726
 * [new tag]             phabricator/diff/39727 -> phabricator/diff/39727
 * [new tag]             phabricator/diff/39728 -> phabricator/diff/39728
 * [new tag]             phabricator/diff/39730 -> phabricator/diff/39730
 * [new tag]             phabricator/diff/39732 -> phabricator/diff/39732
 * [new tag]             phabricator/diff/39750 -> phabricator/diff/39750
 * [new tag]             phabricator/diff/39752 -> phabricator/diff/39752
 * [new tag]             phabricator/diff/39753 -> phabricator/diff/39753
 * [new tag]             phabricator/diff/39774 -> phabricator/diff/39774
 * [new tag]             phabricator/diff/39775 -> phabricator/diff/39775
 * [new tag]             phabricator/diff/39778 -> phabricator/diff/39778
 * [new tag]             phabricator/diff/39780 -> phabricator/diff/39780
 * [new tag]             phabricator/diff/39783 -> phabricator/diff/39783
 * [new tag]             phabricator/diff/39784 -> phabricator/diff/39784
 * [new tag]             phabricator/diff/39785 -> phabricator/diff/39785
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-win failed with exit code 1

Build Bitcoin ABC Diffs / Diff Testing (gitian-osx) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39590 -> phabricator/diff/39590
 * [new tag]             phabricator/diff/39592 -> phabricator/diff/39592
 * [new tag]             phabricator/diff/39601 -> phabricator/diff/39601
 * [new tag]             phabricator/diff/39625 -> phabricator/diff/39625
 * [new tag]             phabricator/diff/39626 -> phabricator/diff/39626
 * [new tag]             phabricator/diff/39631 -> phabricator/diff/39631
 * [new tag]             phabricator/diff/39632 -> phabricator/diff/39632
 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39649 -> phabricator/diff/39649
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39656 -> phabricator/diff/39656
 * [new tag]             phabricator/diff/39660 -> phabricator/diff/39660
 * [new tag]             phabricator/diff/39665 -> phabricator/diff/39665
 * [new tag]             phabricator/diff/39666 -> phabricator/diff/39666
 * [new tag]             phabricator/diff/39667 -> phabricator/diff/39667
 * [new tag]             phabricator/diff/39670 -> phabricator/diff/39670
 * [new tag]             phabricator/diff/39675 -> phabricator/diff/39675
 * [new tag]             phabricator/diff/39677 -> phabricator/diff/39677
 * [new tag]             phabricator/diff/39678 -> phabricator/diff/39678
 * [new tag]             phabricator/diff/39689 -> phabricator/diff/39689
 * [new tag]             phabricator/diff/39697 -> phabricator/diff/39697
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39703 -> phabricator/diff/39703
 * [new tag]             phabricator/diff/39706 -> phabricator/diff/39706
 * [new tag]             phabricator/diff/39707 -> phabricator/diff/39707
 * [new tag]             phabricator/diff/39709 -> phabricator/diff/39709
 * [new tag]             phabricator/diff/39730 -> phabricator/diff/39730
 * [new tag]             phabricator/diff/39732 -> phabricator/diff/39732
 * [new tag]             phabricator/diff/39747 -> phabricator/diff/39747
 * [new tag]             phabricator/diff/39752 -> phabricator/diff/39752
 * [new tag]             phabricator/diff/39783 -> phabricator/diff/39783
 * [new tag]             phabricator/diff/39784 -> phabricator/diff/39784
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-osx failed with exit code 1

put WINDRES in the correct default.mk file

@bot gitian-win

teamcity updated a token.Apr 17 2023, 16:56

Harbormaster completed remote builds in B23348: Diff 39786.Apr 17 2023, 17:12

drop commit "build: Add QMacStyle support"
It does not compile, I don't find a solution and it is not important enough to block this

Harbormaster completed remote builds in B23349: Diff 39787.Apr 17 2023, 18:11

@bot gitian-osx

teamcity updated a token.Apr 17 2023, 18:27

Build Bitcoin ABC Diffs / Diff Testing (gitian-osx) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/39640 -> phabricator/diff/39640
 * [new tag]             phabricator/diff/39641 -> phabricator/diff/39641
 * [new tag]             phabricator/diff/39642 -> phabricator/diff/39642
 * [new tag]             phabricator/diff/39645 -> phabricator/diff/39645
 * [new tag]             phabricator/diff/39650 -> phabricator/diff/39650
 * [new tag]             phabricator/diff/39655 -> phabricator/diff/39655
 * [new tag]             phabricator/diff/39660 -> phabricator/diff/39660
 * [new tag]             phabricator/diff/39662 -> phabricator/diff/39662
 * [new tag]             phabricator/diff/39666 -> phabricator/diff/39666
 * [new tag]             phabricator/diff/39672 -> phabricator/diff/39672
 * [new tag]             phabricator/diff/39682 -> phabricator/diff/39682
 * [new tag]             phabricator/diff/39685 -> phabricator/diff/39685
 * [new tag]             phabricator/diff/39686 -> phabricator/diff/39686
 * [new tag]             phabricator/diff/39701 -> phabricator/diff/39701
 * [new tag]             phabricator/diff/39702 -> phabricator/diff/39702
 * [new tag]             phabricator/diff/39719 -> phabricator/diff/39719
 * [new tag]             phabricator/diff/39720 -> phabricator/diff/39720
 * [new tag]             phabricator/diff/39721 -> phabricator/diff/39721
 * [new tag]             phabricator/diff/39723 -> phabricator/diff/39723
 * [new tag]             phabricator/diff/39740 -> phabricator/diff/39740
 * [new tag]             phabricator/diff/39746 -> phabricator/diff/39746
 * [new tag]             phabricator/diff/39747 -> phabricator/diff/39747
 * [new tag]             phabricator/diff/39750 -> phabricator/diff/39750
 * [new tag]             phabricator/diff/39751 -> phabricator/diff/39751
 * [new tag]             phabricator/diff/39752 -> phabricator/diff/39752
 * [new tag]             phabricator/diff/39753 -> phabricator/diff/39753
 * [new tag]             phabricator/diff/39775 -> phabricator/diff/39775
 * [new tag]             phabricator/diff/39776 -> phabricator/diff/39776
 * [new tag]             phabricator/diff/39778 -> phabricator/diff/39778
 * [new tag]             phabricator/diff/39780 -> phabricator/diff/39780
 * [new tag]             phabricator/diff/39781 -> phabricator/diff/39781
 * [new tag]             phabricator/diff/39783 -> phabricator/diff/39783
 * [new tag]             phabricator/diff/39784 -> phabricator/diff/39784
 * [new tag]             phabricator/diff/39786 -> phabricator/diff/39786
 * [new tag]             phabricator/diff/39787 -> phabricator/diff/39787
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-osx failed with exit code 1

rebase

@bot gitian-win gitian-osx gitian-linux

teamcity updated a token.Apr 28 2023, 08:01

Harbormaster completed remote builds in B23543: Diff 40061.Apr 28 2023, 09:06

squash with D13732 (bumping to 5.12.11 which enables skipping a patch and fixes minor issues) and core#21655 (minor change)
include "build: Add QMacStyle support" commit (previously dropped to troubleshoot an issue related to the outdated MacOS toolchain)

@bot gitian-win gitian-osx gitian-linux

teamcity updated a token.Apr 28 2023, 09:54

PiRK mentioned this in D13732: depends: Bump Qt version to 5.12.11.Apr 28 2023, 10:01

Harbormaster completed remote builds in B23545: Diff 40064.Apr 28 2023, 10:09

@bot gitian-win gitian-osx gitian-linux

teamcity updated a token.Apr 28 2023, 10:38

PiRK published this revision for review.Apr 28 2023, 10:39

It looks deterministic

Builds:
#61895
#61894
#61893
#61892
#61891
#61890

ac014c827575168114fcb521272cfd8416a17c8a5de015aa2614d1706ac2155d  bitcoin-abc-0.27.4-aarch64-linux-gnu-debug.tar.gz
079743a15dcad6a4011bde358f89c3413fb46e387e814140b927354b914c27c4  bitcoin-abc-0.27.4-aarch64-linux-gnu.tar.gz
00bdd8cd8bf1fa448997290eaea735f6ac0ffc1ba81516e29fc5e703d5c449af  bitcoin-abc-0.27.4-arm-linux-gnueabihf-debug.tar.gz
e9798e62fe32d59572f20327b3565b107ce773ceec56ace2488ddf1258d0da14  bitcoin-abc-0.27.4-arm-linux-gnueabihf.tar.gz
415dcb3fd667a40b8e2ed691d3242db5ce20e200efbb24304be82d6423ab03c5  bitcoin-abc-0.27.4-x86_64-linux-gnu-debug.tar.gz
06600e30c273902624cb3cabcb6273894ef7b5b62a30f0ab425939b086b81ed5  bitcoin-abc-0.27.4-x86_64-linux-gnu.tar.gz
bc0f6e9e23a4fd73cf469eb50c1cd77ec8c02f0aab4c59d7caeff880820f8fe1  src/bitcoin-abc-0.27.4.tar.gz

a0346fca5a046f367edfb3d4cfe42bd2d377a852f6dfe6905192f017da8be413  bitcoin-abc-0.27.4-win64-debug.zip
f110e7d784b25afee8a80780102060ce34e846aebd5037d4be402cb6a9e5960e  bitcoin-abc-0.27.4-win64-setup-unsigned.exe
2ff06a9f74db9c88a8a20b23730c47ca271b2e01106710f3385e39ee8365744d  bitcoin-abc-0.27.4-win64.zip
bc0f6e9e23a4fd73cf469eb50c1cd77ec8c02f0aab4c59d7caeff880820f8fe1  src/bitcoin-abc-0.27.4.tar.gz
196811fb72b0291740b110d582c01cd46adabfeaba3cb98da56e53c45630e130  bitcoin-abc-win-res.yml

a0482752fe2016e6befc9c30fed700905b04b93b82c030d1510b246d1a45ec4c  bitcoin-abc-0.27.4-osx-unsigned.dmg
c490504147c4b229636a59fda1248c11f9b1b241b19e0ba76b47f9d40ca82393  bitcoin-abc-0.27.4-osx-unsigned.tar.gz
e39f249d2aa8ff3207201f3f82c2d770e035cb0c0d859857a170d2fd0cf89a5d  bitcoin-abc-0.27.4-osx64.tar.gz
bc0f6e9e23a4fd73cf469eb50c1cd77ec8c02f0aab4c59d7caeff880820f8fe1  src/bitcoin-abc-0.27.4.tar.gz

Fabien requested changes to this revision.Apr 28 2023, 13:45

Fabien added a subscriber: Fabien.

Fabien added inline comments.

contrib/gitian-descriptors/gitian-linux.yml
15	Not sure if it's really needed, I think it's part of build-essentials which is installed by default. But it doesn't hurt.
depends/README.md
57	nit: sort
depends/packages/libxkbcommon.mk
22
src/qt/paymentrequestplus.cpp
173	I don't understand this change. If your system is unable to detect EVP_MD_CTX_new() this is a problem that needs to be addressed

This revision now requires changes to proceed.Apr 28 2023, 13:45

PiRK mentioned this in D13848: simplify detection of OpenSSL version.May 3 2023, 10:02

rebase onto D13864, review

@bot gitian-linux gitian-osx gitian-win

teamcity updated a token.May 5 2023, 14:13

this will be landed after may 15th, so keep it unreviewed until then

Harbormaster completed remote builds in B23643: Diff 40210.May 5 2023, 14:37

PiRK mentioned this in D13864: [cmake] Improve EVP_MD_CTX_new detection.May 5 2023, 15:09

PiRK added a child revision: D13870: build, qt, refactor: Drop sed commands for win32-g++/qmake.conf.May 9 2023, 13:45

rebase (style changes only)

PiRK edited the summary of this revision. (Show Details)May 19 2023, 07:17

rebase

Harbormaster completed remote builds in B23749: Diff 40365.May 19 2023, 07:40

Harbormaster completed remote builds in B23750: Diff 40366.May 19 2023, 07:52

@bot gitian-linux gitian-osx gitian-win

teamcity updated a token.May 19 2023, 14:01

Fabien accepted this revision.May 19 2023, 20:46

This revision is now accepted and ready to land.May 19 2023, 20:46

Closed by commit rABC36d57557f4bd: depends: Qt 5.12.11 (authored by fanquake <fanquake@gmail.com>, committed by PiRK). · Explain WhyMay 22 2023, 05:52

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC36d57557f4bd: depends: Qt 5.12.11.

depends: Qt 5.12.11
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 40064

contrib/devtools/symbol-check.py

contrib/gitian-descriptors/gitian-linux.yml

contrib/gitian-descriptors/gitian-osx.yml

contrib/gitian-descriptors/gitian-win.yml

contrib/utils/install-dependencies-bullseye.sh

depends/README.md

depends/hosts/default.mk

depends/packages/libxcb.mk

depends/packages/libxkbcommon.mk

depends/packages/openssl.mk

depends/packages/packages.mk

depends/packages/qt.mk

depends/packages/zlib.mk

depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch

depends/patches/qt/drop_lrelease_dependency.patch

depends/patches/qt/fix_configure_mac.patch

depends/patches/qt/fix_lib_paths.patch

depends/patches/qt/fix_mingw_cross_compile.patch

depends/patches/qt/fix_no_printer.patch

depends/patches/qt/fix_numeric_limits_compile_error.patch

depends/patches/qt/fix_qt_pkgconfig.patch

depends/patches/qt/fix_rcc_determinism.patch

depends/patches/qt/no-xlib.patch

depends/patches/qt/no_sdk_version_check.patch

depends/patches/qt/xkb-default.patch

doc/dependencies.md

src/qt/CMakeLists.txt

src/qt/bitcoin.cpp

src/qt/paymentrequestplus.cpp

depends: Qt 5.12.11ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 40064

contrib/devtools/symbol-check.py

contrib/gitian-descriptors/gitian-linux.yml

contrib/gitian-descriptors/gitian-osx.yml

contrib/gitian-descriptors/gitian-win.yml

contrib/utils/install-dependencies-bullseye.sh

depends/README.md

depends/hosts/default.mk

depends/packages/libxcb.mk

depends/packages/libxkbcommon.mk

depends/packages/openssl.mk

depends/packages/packages.mk

depends/packages/qt.mk

depends/packages/zlib.mk

depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch

depends/patches/qt/drop_lrelease_dependency.patch

depends/patches/qt/fix_configure_mac.patch

depends/patches/qt/fix_lib_paths.patch

depends/patches/qt/fix_mingw_cross_compile.patch

depends/patches/qt/fix_no_printer.patch

depends/patches/qt/fix_numeric_limits_compile_error.patch

depends/patches/qt/fix_qt_pkgconfig.patch

depends/patches/qt/fix_rcc_determinism.patch

depends/patches/qt/no-xlib.patch

depends/patches/qt/no_sdk_version_check.patch

depends/patches/qt/xkb-default.patch

doc/dependencies.md

src/qt/CMakeLists.txt

src/qt/bitcoin.cpp

src/qt/paymentrequestplus.cpp

depends: Qt 5.12.11
ClosedPublic
Actions

Revision Contents
Changeset List