diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-10 09:41:55 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-10 09:45:05 +0800 |
| commit | 92584d29cee307249c22d9e244eff10fce068178 (patch) | |
| tree | f076432a7690004cf81d033f275b9d907360e38f /contrib/devtools | |
| parent | 46424e943c0b2e9d006ade6bfe3dc02f19c1d5c0 (diff) | |
| parent | d1d1cc983146ece950430da78ebae6f502913a53 (diff) | |
| download | bitcoin-92584d29cee307249c22d9e244eff10fce068178.tar.xz | |
Merge bitcoin/bitcoin#22186: build, qt: Fix compiling qt package in depends with GCC 11
d1d1cc983146ece950430da78ebae6f502913a53 build, qt: Fix compiling qt package in depends with GCC 11 (Hennadii Stepanov)
Pull request description:
The `qt` package in depends fails to compile with GCC 11 due to the missed `<limits>` headers.
See: https://bugreports.qt.io/browse/QTBUG-90395
Affected systems:
- Ubuntu 21.04 + GCC 11.1.0
- Fedora 34 + GCC 11.1.1
Ubuntu 21.04 build log excerpt:
```
Configuring qt...
Creating qmake...
gmake[1]: Entering directory '/home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/qmake'
In file included from /home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/include/QtCore/qendian.h:1,
from /home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/src/corelib/codecs/qutfcodec.cpp:43:
/home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/include/QtCore/../../src/corelib/global/qendian.h: In static member function ‘static constexpr QSpecialInteger<S> QSpecialInteger<S>::max()’:
/home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/include/QtCore/../../src/corelib/global/qendian.h:331:35: error: ‘numeric_limits’ is not a member of ‘std’
331 | { return QSpecialInteger(std::numeric_limits<T>::max()); }
| ^~~~~~~~~~~~~~
/home/hebasto/bitcoin/depends/work/build/x86_64-pc-linux-gnu/qt/5.12.11-1ff5c6c1f55/qtbase/include/QtCore/../../src/corelib/global/qendian.h:331:54: error: ‘::max’ has not been declared; did you mean ‘std::max’?
331 | { return QSpecialInteger(std::numeric_limits<T>::max()); }
| ^~~
| std::max
```
ACKs for top commit:
fanquake:
ACK d1d1cc983146ece950430da78ebae6f502913a53
Tree-SHA512: 2dd643efc0aefc492f9565c0900ba0f1657c016bc4a44792f85478b9fc6e0e4ecad78847114ef6ec702d2de4cdbc3f657e9b96634ea58f42b6cc98dfb5e09eab
Diffstat (limited to 'contrib/devtools')
0 files changed, 0 insertions, 0 deletions