Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

depends: fix mingw-w64 Qt DEBUG=1 build #29747

Merged
merged 1 commit into from Mar 27, 2024

Conversation

fanquake
Copy link
Member

The issue is that compilation is done with x86_64-w64-mingw32-g++-posix, but then linking is done with x86_64-w64-mingw32-g++.

I'm guessing this has been broken since #24131 (01d1845), but have not checked.

Fixes #29734.
Unblocks #29527 (DEBUG=1 builds can be tested).

The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since bitcoin#24131
(01d1845), but have not checked.

Fixes bitcoin#29734.
Unblocks bitcoin#29527 (now DEBUG=1 builds can be tested).
@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 27, 2024

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@fanquake
Copy link
Member Author

Guix Build (aarch64):

979178d40158693d10fef1897f3dfd1f0fbfd008a92b1fd27713cb66e5b8b8fa  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/SHA256SUMS.part
36bf67bc413ede45788a1f1cb31c83839d0f59c49e8bbf52e811854a54fe936c  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/bitcoin-b7e7e727abd8-aarch64-linux-gnu-debug.tar.gz
8a5331e33ab1a23eb037841127905cbc2346ca5b84b6d1dbc6cd0a2682a4b0a5  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/bitcoin-b7e7e727abd8-aarch64-linux-gnu.tar.gz
12d03eb52ef823231b2afc4632a70139ff3e7195966c76090f5da640c90f0695  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/SHA256SUMS.part
88ba75a674bb8ec537dfefdeac43785be0621ed4241be8cb858514498d98b1ef  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/bitcoin-b7e7e727abd8-arm-linux-gnueabihf-debug.tar.gz
356f9fb063360a49b263f326f1eabec36182c32a835019fb74aa7e2dc82c746e  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/bitcoin-b7e7e727abd8-arm-linux-gnueabihf.tar.gz
b7729d054d11f9d6a8e41cf511e3f0828cb5026878bce46951435cb56bdc1f4b  guix-build-b7e7e727abd8/output/arm64-apple-darwin/SHA256SUMS.part
0a69c56d7d6caf6dd9018be08f18cca7ee3007d2a10f31fa4cb25698a5b0ff7a  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin-unsigned.tar.gz
9ff5fb61733fa9c835118b40eb2afdf0d3c383765d03bb8d7ab62d3f527fdc5e  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin-unsigned.zip
dccd31f8e0be03848ae6d122536939821d1f37fe35a737651cf3a47dccd11eb3  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin.tar.gz
4c8169021c505f45d144cffe4a5db307e23a21c6e9dc7ad80a6fc396ada8fcca  guix-build-b7e7e727abd8/output/dist-archive/bitcoin-b7e7e727abd8.tar.gz
3c315c7872a4b818474525775f8b0ffadbe1ff61e84b274cd579593161665fd9  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/SHA256SUMS.part
f512dcf753b266530455fe2618be5f8717d9175a24c3b0c59b02b620f3bf2930  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/bitcoin-b7e7e727abd8-powerpc64-linux-gnu-debug.tar.gz
0274dd47a0a9ccb56253af179a7c9b9a56dad6a563ccf47921389f1ea492613b  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/bitcoin-b7e7e727abd8-powerpc64-linux-gnu.tar.gz
4d63408693a66ff21710e4eb2f669ec91e310260c64f5826d59721c93e781d15  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/SHA256SUMS.part
5e2838f9819edf3fca5364e807f9453e441ed214b3ead54f3f46f584b71ec4e5  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/bitcoin-b7e7e727abd8-riscv64-linux-gnu-debug.tar.gz
2f24933969e28412493a7ee1cdf381ead4282a5cac8777927216d1b58407e730  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/bitcoin-b7e7e727abd8-riscv64-linux-gnu.tar.gz
163ee9499534224abe95e92f10c97303035fbf8eb769f25e5bba4b07b2f39923  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/SHA256SUMS.part
8a7e93ee54cb8916d84f577ad3872ae6192a99689ecd7b1cfe5d6fb8092a3363  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin-unsigned.tar.gz
40e3510fa899127dcb042e67d5d982f19dbd684afdf9169967f544b593189723  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin-unsigned.zip
3bc71d190d783d5f16da7350ed007fbb8a82504715f12ca5fe23f691cf042a9a  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin.tar.gz
f332354ca500aa3ae7eec0ad2717f8d37815836147aec7a9481e9a6e8b3136b7  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/SHA256SUMS.part
e8c32366e9e8a91097fbb8ec3dc820f4dcc4cb94ba4321e39ab5803d10019172  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/bitcoin-b7e7e727abd8-x86_64-linux-gnu-debug.tar.gz
fea1c60824284df3bc55de9649677baef838f780a23b7cb36c811ab5d4608f70  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/bitcoin-b7e7e727abd8-x86_64-linux-gnu.tar.gz
f6616cad45ea4a0079a9d4a795ae5213841c6278909bdb53e0efeb90da1b0e62  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/SHA256SUMS.part
2defacfab80d43611f8d044e4dfe6772d88e4ef4ee558d41edbc70e3e61ab4bb  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-debug.zip
af3385820b56abe07734812560fcd238ebd8370f6cb8a15b81ca81b353ce18a3  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-setup-unsigned.exe
eed062fcd8b58e86d855b6898e70ffed84066ac779d530d354698d4f868ab1bf  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-unsigned.tar.gz
944d248217126efbf2e25e3e71f26c46dc64db6852b8b8e2b0bc01c76a650274  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64.zip

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK b7e7e72, tested on Ubuntu 22.04 with the installed g++-mingw-w64-x86-64 package.

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK b7e7e72

Guix builds (x86_64)

979178d40158693d10fef1897f3dfd1f0fbfd008a92b1fd27713cb66e5b8b8fa  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/SHA256SUMS.part
36bf67bc413ede45788a1f1cb31c83839d0f59c49e8bbf52e811854a54fe936c  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/bitcoin-b7e7e727abd8-aarch64-linux-gnu-debug.tar.gz
8a5331e33ab1a23eb037841127905cbc2346ca5b84b6d1dbc6cd0a2682a4b0a5  guix-build-b7e7e727abd8/output/aarch64-linux-gnu/bitcoin-b7e7e727abd8-aarch64-linux-gnu.tar.gz
12d03eb52ef823231b2afc4632a70139ff3e7195966c76090f5da640c90f0695  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/SHA256SUMS.part
88ba75a674bb8ec537dfefdeac43785be0621ed4241be8cb858514498d98b1ef  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/bitcoin-b7e7e727abd8-arm-linux-gnueabihf-debug.tar.gz
356f9fb063360a49b263f326f1eabec36182c32a835019fb74aa7e2dc82c746e  guix-build-b7e7e727abd8/output/arm-linux-gnueabihf/bitcoin-b7e7e727abd8-arm-linux-gnueabihf.tar.gz
b7729d054d11f9d6a8e41cf511e3f0828cb5026878bce46951435cb56bdc1f4b  guix-build-b7e7e727abd8/output/arm64-apple-darwin/SHA256SUMS.part
0a69c56d7d6caf6dd9018be08f18cca7ee3007d2a10f31fa4cb25698a5b0ff7a  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin-unsigned.tar.gz
9ff5fb61733fa9c835118b40eb2afdf0d3c383765d03bb8d7ab62d3f527fdc5e  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin-unsigned.zip
dccd31f8e0be03848ae6d122536939821d1f37fe35a737651cf3a47dccd11eb3  guix-build-b7e7e727abd8/output/arm64-apple-darwin/bitcoin-b7e7e727abd8-arm64-apple-darwin.tar.gz
4c8169021c505f45d144cffe4a5db307e23a21c6e9dc7ad80a6fc396ada8fcca  guix-build-b7e7e727abd8/output/dist-archive/bitcoin-b7e7e727abd8.tar.gz
3c315c7872a4b818474525775f8b0ffadbe1ff61e84b274cd579593161665fd9  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/SHA256SUMS.part
f512dcf753b266530455fe2618be5f8717d9175a24c3b0c59b02b620f3bf2930  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/bitcoin-b7e7e727abd8-powerpc64-linux-gnu-debug.tar.gz
0274dd47a0a9ccb56253af179a7c9b9a56dad6a563ccf47921389f1ea492613b  guix-build-b7e7e727abd8/output/powerpc64-linux-gnu/bitcoin-b7e7e727abd8-powerpc64-linux-gnu.tar.gz
4d63408693a66ff21710e4eb2f669ec91e310260c64f5826d59721c93e781d15  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/SHA256SUMS.part
5e2838f9819edf3fca5364e807f9453e441ed214b3ead54f3f46f584b71ec4e5  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/bitcoin-b7e7e727abd8-riscv64-linux-gnu-debug.tar.gz
2f24933969e28412493a7ee1cdf381ead4282a5cac8777927216d1b58407e730  guix-build-b7e7e727abd8/output/riscv64-linux-gnu/bitcoin-b7e7e727abd8-riscv64-linux-gnu.tar.gz
163ee9499534224abe95e92f10c97303035fbf8eb769f25e5bba4b07b2f39923  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/SHA256SUMS.part
8a7e93ee54cb8916d84f577ad3872ae6192a99689ecd7b1cfe5d6fb8092a3363  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin-unsigned.tar.gz
40e3510fa899127dcb042e67d5d982f19dbd684afdf9169967f544b593189723  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin-unsigned.zip
3bc71d190d783d5f16da7350ed007fbb8a82504715f12ca5fe23f691cf042a9a  guix-build-b7e7e727abd8/output/x86_64-apple-darwin/bitcoin-b7e7e727abd8-x86_64-apple-darwin.tar.gz
f332354ca500aa3ae7eec0ad2717f8d37815836147aec7a9481e9a6e8b3136b7  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/SHA256SUMS.part
e8c32366e9e8a91097fbb8ec3dc820f4dcc4cb94ba4321e39ab5803d10019172  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/bitcoin-b7e7e727abd8-x86_64-linux-gnu-debug.tar.gz
fea1c60824284df3bc55de9649677baef838f780a23b7cb36c811ab5d4608f70  guix-build-b7e7e727abd8/output/x86_64-linux-gnu/bitcoin-b7e7e727abd8-x86_64-linux-gnu.tar.gz
f6616cad45ea4a0079a9d4a795ae5213841c6278909bdb53e0efeb90da1b0e62  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/SHA256SUMS.part
2defacfab80d43611f8d044e4dfe6772d88e4ef4ee558d41edbc70e3e61ab4bb  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-debug.zip
af3385820b56abe07734812560fcd238ebd8370f6cb8a15b81ca81b353ce18a3  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-setup-unsigned.exe
eed062fcd8b58e86d855b6898e70ffed84066ac779d530d354698d4f868ab1bf  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64-unsigned.tar.gz
944d248217126efbf2e25e3e71f26c46dc64db6852b8b8e2b0bc01c76a650274  guix-build-b7e7e727abd8/output/x86_64-w64-mingw32/bitcoin-b7e7e727abd8-win64.zip

@fanquake fanquake merged commit 7a12cbe into bitcoin:master Mar 27, 2024
16 checks passed
@fanquake fanquake deleted the fix_qt_debug_link branch March 27, 2024 16:37
fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 16, 2024
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since bitcoin#24131
(01d1845), but have not checked.

Fixes bitcoin#29734.
Unblocks bitcoin#29527 (now DEBUG=1 builds can be tested).

Github-Pull: bitcoin#29747
Rebased-From: b7e7e72
@fanquake fanquake mentioned this pull request Apr 16, 2024
@fanquake
Copy link
Member Author

Backported to 27.x in #29888.

luke-jr pushed a commit to bitcoinknots/bitcoin that referenced this pull request Apr 24, 2024
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since bitcoin#24131
(01d1845), but have not checked.

Fixes bitcoin#29734.
Unblocks bitcoin#29527 (now DEBUG=1 builds can be tested).

Github-Pull: bitcoin#29747
Rebased-From: b7e7e72
fanquake added a commit that referenced this pull request May 13, 2024
bd5860b [WIP] doc: release notes for 27.x (fanquake)
475aac4 doc: add LLVM instruction for macOS < 13 (Sjors Provoost)
a995902 depends: Fix build of Qt for 32-bit platforms (laanwj)
0fcceef Fix #29767, set m_synced = true after Commit() (nanlour)
ae9a2ed sign: don't assume we are parsing a sane Miniscript (Antoine Poinsot)
a6a59cf rpc: Reword SighashFromStr error message (MarcoFalke)
364bf01 build: Fix false positive `CHECK_ATOMIC` test for clang-15 (Hennadii Stepanov)
9277793 test: Fix failing univalue float test (MarcoFalke)
5c09791 doc: archive 27.0 release notes (fanquake)
897e5af [rpc, bugfix] Enforce maximum value for setmocktime (dergoegge)
602cfd5 ci: Bump s390x to ubuntu:24.04 (MarcoFalke)
20e6e8d Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us (Luke Dashjr)
a6862c5 depends: fix mingw-w64 Qt DEBUG=1 build (fanquake)

Pull request description:

  Backports:
  * #29691
  * #29747
  * #29776
  * #29853
  * #29856
  * #29859
  * #29869
  * #29870
  * #29886
  * #29892
  * #29934
  * #29985

ACKs for top commit:
  willcl-ark:
    reACK bd5860b
  stickies-v:
    re-ACK bd5860b
  TheCharlatan:
    ACK bd5860b

Tree-SHA512: a1a40de70cf52b5fc01d9dcc772421751a18c6a48a726c4c05c0371c585a53a27902e17daed9e0d721ab7763c94bb32de05c146bd6bc73fd558edd08b31e8547
glozow pushed a commit to glozow/bitcoin that referenced this pull request May 13, 2024
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since bitcoin#24131
(01d1845), but have not checked.

Fixes bitcoin#29734.
Unblocks bitcoin#29527 (now DEBUG=1 builds can be tested).

Github-Pull: bitcoin#29747
Rebased-From: b7e7e72
@glozow
Copy link
Member

glozow commented May 14, 2024

backported to 26.x in #29899

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

qt: Windows build with DEBUG=1 is broken
5 participants