depends: Fix build of Qt for 32-bit platforms with recent glibc #29985
+33
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
|
Concept ACK. I was thinking about picking up the same patch :) |
laanwj
changed the title
laanwj
changed the title
laanwj
commented
Apr 28, 2024
laanwj
force-pushed
the
2024-04-qt-gzip-time64
branch
2 times, most recently
from
b1bd981
to
2fb0092
Compare
|
Force-pushed because somehow had gzip and zlib names mixed up in my head, only the branch name remains 😄 No other changes. |
This was referenced Apr 28, 2024
hebasto
reviewed
Apr 28, 2024
There was a problem hiding this comment.
My Guix builds:
x86_64
1a25e6c850955fe222604b29409f46da89d1dd987b9e4ecb1e0c584638d0b306 guix-build-2fb0092a9cc5/output/aarch64-linux-gnu/SHA256SUMS.part
1616ef50b4eb68240353fea259ceb9dbe387047389b56ea97049121d00cccb7a guix-build-2fb0092a9cc5/output/aarch64-linux-gnu/bitcoin-2fb0092a9cc5-aarch64-linux-gnu-debug.tar.gz
27815c05ea9efb38297e9df97a042876063f83bec3f9054a4170b406b80b31a9 guix-build-2fb0092a9cc5/output/aarch64-linux-gnu/bitcoin-2fb0092a9cc5-aarch64-linux-gnu.tar.gz
6a5172a7a2377745237f019ec8904b3d349e3719be1430c860245bc309079196 guix-build-2fb0092a9cc5/output/arm-linux-gnueabihf/SHA256SUMS.part
b0cd99df30bd1538adbd3a3b8ddbfbf88ce8f727cd64473b051eeb25048bb860 guix-build-2fb0092a9cc5/output/arm-linux-gnueabihf/bitcoin-2fb0092a9cc5-arm-linux-gnueabihf-debug.tar.gz
b24b9751ea02ab48287f5c769277bda705d1118529df2d86092ba44e2e530296 guix-build-2fb0092a9cc5/output/arm-linux-gnueabihf/bitcoin-2fb0092a9cc5-arm-linux-gnueabihf.tar.gz
38ed6ec21ec0e3db4e04680a1465a2730bd272f5d4c827e84bf6db7c2d4f6a00 guix-build-2fb0092a9cc5/output/arm64-apple-darwin/SHA256SUMS.part
2c83f5f4708b6945af7442eb06419bbe80845294ff7b4a250e3304d562b1df50 guix-build-2fb0092a9cc5/output/arm64-apple-darwin/bitcoin-2fb0092a9cc5-arm64-apple-darwin-unsigned.tar.gz
778c3b0669e92882f4466afff4357dd2bdd2692aec713f8ddfd27dc466c1977f guix-build-2fb0092a9cc5/output/arm64-apple-darwin/bitcoin-2fb0092a9cc5-arm64-apple-darwin-unsigned.zip
0bbe336088365464c96dc48cca6a648b6a5242e5a9bd23ceb95a4294f1cba05a guix-build-2fb0092a9cc5/output/arm64-apple-darwin/bitcoin-2fb0092a9cc5-arm64-apple-darwin.tar.gz
09e541507b55916960ece135d999d61df6f3384d1ac8b2e68977ad5afa403664 guix-build-2fb0092a9cc5/output/dist-archive/bitcoin-2fb0092a9cc5.tar.gz
03ffcaad9bc100e7a404838bb2c668f932112c0cca0c8b796dc78b24ddd9f0da guix-build-2fb0092a9cc5/output/powerpc64-linux-gnu/SHA256SUMS.part
4c9e380a8460c2cddda184cda8cb798a2e9833ac01a594c8a00c32139a2a5ddf guix-build-2fb0092a9cc5/output/powerpc64-linux-gnu/bitcoin-2fb0092a9cc5-powerpc64-linux-gnu-debug.tar.gz
287ba4098d6c4b2bee508b3e081d43d7f93f7f7bb67e3d312f5432875806613d guix-build-2fb0092a9cc5/output/powerpc64-linux-gnu/bitcoin-2fb0092a9cc5-powerpc64-linux-gnu.tar.gz
aa5fba6ced4f9ab2924973320f7800de0812ba8bdf5f238652afc34dcb912c9f guix-build-2fb0092a9cc5/output/riscv64-linux-gnu/SHA256SUMS.part
b3d38359beef8abd28d3329cf78179b202940a64844fcbf5fdf3a85e2599e663 guix-build-2fb0092a9cc5/output/riscv64-linux-gnu/bitcoin-2fb0092a9cc5-riscv64-linux-gnu-debug.tar.gz
85964644704d03ae3d2343ef63bcbd884b216a41929b26fbf56cbe2fa079fc50 guix-build-2fb0092a9cc5/output/riscv64-linux-gnu/bitcoin-2fb0092a9cc5-riscv64-linux-gnu.tar.gz
611a0e960d6cd5b3ad9d7c29f6d021d9519356ceb57ade57e4de02d2a908c177 guix-build-2fb0092a9cc5/output/x86_64-apple-darwin/SHA256SUMS.part
c267336053217e1b430d36de4df33403168217083dbc1115f75f7e5f188560fe guix-build-2fb0092a9cc5/output/x86_64-apple-darwin/bitcoin-2fb0092a9cc5-x86_64-apple-darwin-unsigned.tar.gz
3acb58f370eee8631fba0d71ff596edc32527fcd3f1d566c037663e739bf9605 guix-build-2fb0092a9cc5/output/x86_64-apple-darwin/bitcoin-2fb0092a9cc5-x86_64-apple-darwin-unsigned.zip
1b4385e864ad9a9797e8fb24ff591e9d65f7e2f191535592ccbed83043068fd3 guix-build-2fb0092a9cc5/output/x86_64-apple-darwin/bitcoin-2fb0092a9cc5-x86_64-apple-darwin.tar.gz
0712463a3c3e3bf76355ff707ee0435ac8f8ec7cabdc52635b0e991c861627b0 guix-build-2fb0092a9cc5/output/x86_64-linux-gnu/SHA256SUMS.part
40d8c047f4082154a0741e3e72e39d8d1f58871f15ee5cbf6c8c20d55bdfb772 guix-build-2fb0092a9cc5/output/x86_64-linux-gnu/bitcoin-2fb0092a9cc5-x86_64-linux-gnu-debug.tar.gz
51a6ed9297ea96407bce997de3e610d62fd487e84df1bab52915b899f57bc0f8 guix-build-2fb0092a9cc5/output/x86_64-linux-gnu/bitcoin-2fb0092a9cc5-x86_64-linux-gnu.tar.gz
a7ff61b4e6f6a04c2b22738c01b7fdf16ef067b23996ecb74d6a90abf6098c84 guix-build-2fb0092a9cc5/output/x86_64-w64-mingw32/SHA256SUMS.part
5de5c82b1adb2a26e6b174113086a53609109b6017d6fed0ed2ce7b5fc189db0 guix-build-2fb0092a9cc5/output/x86_64-w64-mingw32/bitcoin-2fb0092a9cc5-win64-debug.zip
8fba05a67e3b7ad8e584f447ec8d424334f6b16c10c23c7484fa52ce148dd296 guix-build-2fb0092a9cc5/output/x86_64-w64-mingw32/bitcoin-2fb0092a9cc5-win64-setup-unsigned.exe
fcffe3b368ea7ae8183b906539d7562307ddf345e43426f48d81b4ff74b31679 guix-build-2fb0092a9cc5/output/x86_64-w64-mingw32/bitcoin-2fb0092a9cc5-win64-unsigned.tar.gz
fb94ca7e2a9da43e6a8db6ceb5a4b9dd3e49703effef6d977b4c68cc3c116601 guix-build-2fb0092a9cc5/output/x86_64-w64-mingw32/bitcoin-2fb0092a9cc5-win64.zip
hebasto
approved these changes
Apr 28, 2024
The 32 to 64-bit time_t transition causes a build failure in the built-in zlib about conflicting _TIME_BITS and _FILE_OFFSET_BITS. Note that zlib doesn't use time_t at all, so it is a false alarm. Take the following patch from upstream zlib: https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch Closes bitcoin#29980.
laanwj
force-pushed
the
2024-04-qt-gzip-time64
branch
from
2fb0092
to
2e266f3
Compare
|
Force-pushed to apply @hebasto's comment to make the patch apply cleanly. |
hebasto
approved these changes
Apr 29, 2024
|
My Guix builds: |
fanquake
approved these changes
Apr 30, 2024
There was a problem hiding this comment.
ACK 2e266f3 - at some point qt's open source 5.15.x branch will catch up to where they bumped the internal zlib to >= 1.3 (which contains this change), and we'll be able to drop this patch. Checked that it fixes the build issue in the interim.
fanquake
pushed a commit
to fanquake/bitcoin
that referenced
this pull request
Apr 30, 2024
The 32 to 64-bit time_t transition causes a build failure in the built-in zlib about conflicting _TIME_BITS and _FILE_OFFSET_BITS. Note that zlib doesn't use time_t at all, so it is a false alarm. Take the following patch from upstream zlib: https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch Closes bitcoin#29980. Github-Pull: bitcoin#29985 Rebased-From: 2e266f3
|
Backported to 27.x in #29888. |
luke-jr
pushed a commit
to bitcoinknots/bitcoin
that referenced
this pull request
May 8, 2024
The 32 to 64-bit time_t transition causes a build failure in the built-in zlib about conflicting _TIME_BITS and _FILE_OFFSET_BITS. Note that zlib doesn't use time_t at all, so it is a false alarm. Take the following patch from upstream zlib: https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch Closes bitcoin#29980. Github-Pull: bitcoin#29985 Rebased-From: 2e266f3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The 32 to 64-bit
time_ttransition causes a build failure in the built-in zlib about conflicting_TIME_BITSand_FILE_OFFSET_BITS.Note that zlib doesn't use
time_tat all, so it is a false alarm.Take the following patch from upstream zlib:
https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch
Closes #29980.