Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #29985: depends: Fix build of Qt for 32-bit platforms with rece…
…nt glibc 2e266f3 depends: Fix build of Qt for 32-bit platforms (laanwj) Pull request description: 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 #29980. ACKs for top commit: hebasto: re-ACK 2e266f3. fanquake: 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. Tree-SHA512: b297aed8b299c671ff439b5b7b410832ff5004fd9b13c3b4a5fb5bde9dcf24a5eda08cd0a39565ae0641d9533711142bdc2889a32d343b9c4b41bfac24f0ca28
- Loading branch information