Skip to content

Commit faea58e

Browse files
author
MarcoFalke
committed
Bump g++ minimum supported version to 10
Also, enable -Werror=maybe-uninitialized in ci/test/00_setup_env_native_qt5.sh
1 parent 6391644 commit faea58e

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ci/test/00_setup_env_native_qt5.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_qt5
1010
export CI_IMAGE_NAME_TAG="docker.io/debian:bullseye"
11-
# Use minimum supported python3.9 and gcc-9, see doc/dependencies.md
12-
export PACKAGES="gcc-9 g++-9 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
13-
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-9 CXX=g++-9"
11+
# Use minimum supported python3.9 and gcc-10, see doc/dependencies.md
12+
export PACKAGES="gcc-10 g++-10 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
13+
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-10 CXX=g++-10"
1414
export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
1515
export RUN_UNIT_TESTS_SEQUENTIAL="true"
1616
export RUN_UNIT_TESTS="false"
1717
export GOAL="install"
18-
export NO_WERROR=1 # -Werror=maybe-uninitialized
1918
export DOWNLOAD_PREVIOUS_RELEASES="true"
2019
export BITCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-reduce-exports --enable-debug \
2120
CFLAGS=\"-g0 -O2 -funsigned-char\" CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS=\"-g0 -O2 -funsigned-char\""

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
99
| [Autoconf](https://www.gnu.org/software/autoconf/) | [2.69](https://github.com/bitcoin/bitcoin/pull/17769) |
1010
| [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |
1111
| [Clang](https://clang.llvm.org) | [13.0](https://github.com/bitcoin/bitcoin/pull/28210) |
12-
| [GCC](https://gcc.gnu.org) | [9.1](https://github.com/bitcoin/bitcoin/pull/27662) |
12+
| [GCC](https://gcc.gnu.org) | [10.1](https://github.com/bitcoin/bitcoin/pull/28348) |
1313
| [Python](https://www.python.org) (scripts, tests) | [3.9](https://github.com/bitcoin/bitcoin/pull/28211) |
1414
| [systemtap](https://sourceware.org/systemtap/) ([tracing](tracing.md))| N/A |
1515

src/util/hasher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SaltedOutpointHasher
4545
* a slight performance penalty (around 1.6%), but this is compensated by
4646
* memory savings of about 9% which allow for a larger dbcache setting.
4747
*
48-
* @see https://gcc.gnu.org/onlinedocs/gcc-9.2.0/libstdc++/manual/manual/unordered_associative.html
48+
* @see https://gcc.gnu.org/onlinedocs/gcc-13.2.0/libstdc++/manual/manual/unordered_associative.html
4949
*/
5050
size_t operator()(const COutPoint& id) const noexcept {
5151
return SipHashUint256Extra(k0, k1, id.hash, id.n);

0 commit comments

Comments
 (0)