Skip to content

Commit 7af95af

Browse files
committed
Merge bitcoin/bitcoin#29091: build: Bump g++ minimum supported version to 11
fa5844f Remove unused g++-10 workaround (MarcoFalke) fa8409e build: Bump g++ minimum supported version to 11 (MarcoFalke) Pull request description: This drops support for vanilla Ubuntu Focal 20.04 and Debian (Oldstable) Bullseye, compiling from source. Users on those operating systems would have to stick with a pre-compiled release, a previous release branch of Bitcoin Core, upgrade their system, compile their own compiler, or use a non-vanilla PPA or package manager. Otherwise, g++-11 is offered by common distributions: * https://packages.ubuntu.com/jammy/g++ (`g++-11`) * https://packages.debian.org/bookworm/g++ (`g++-12`) * FreeBSD 12/13 ships with g++ 12 * CentOS-like 9 ships with g++ 11 * OpenSuse Tumbleweed ships with g++ 13 https://software.opensuse.org/package/gcc13-c++ (No idea about OpenSuse Leap) ACKs for top commit: TheCharlatan: ACK fa5844f fanquake: ACK fa5844f Tree-SHA512: fc72d3a53956a0a4a6475ebf56b5fce76c3c4c793ed8e774327cad2b0f307d2d1c8aeafe2a414a7eb51f8de6d4bb78d30b8f60bf6e383234079851e72015c6e3
2 parents f1a19d7 + fa5844f commit 7af95af

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

ci/test/00_setup_env_native_previous_releases.sh

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

99
export CONTAINER_NAME=ci_native_previous_releases
10-
export CI_IMAGE_NAME_TAG="docker.io/debian:bullseye"
11-
# Use minimum supported python3.9 and gcc-10, see doc/dependencies.md
12-
export PACKAGES="gcc-10 g++-10 python3-zmq"
13-
export DEP_OPTS="NO_UPNP=1 NO_NATPMP=1 DEBUG=1 CC=gcc-10 CXX=g++-10"
10+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
11+
# Use minimum supported python3.9 (or best effort 3.10) and gcc-11, see doc/dependencies.md
12+
export PACKAGES="gcc-11 g++-11 python3-zmq"
13+
export DEP_OPTS="NO_UPNP=1 NO_NATPMP=1 DEBUG=1 CC=gcc-11 CXX=g++-11"
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"

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) | [14.0](https://github.com/bitcoin/bitcoin/pull/29208) |
12-
| [GCC](https://gcc.gnu.org) | [10.1](https://github.com/bitcoin/bitcoin/pull/28348) |
12+
| [GCC](https://gcc.gnu.org) | [11.1](https://github.com/bitcoin/bitcoin/pull/29091) |
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/fs_helpers.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -249,20 +249,9 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
249249

250250
bool RenameOver(fs::path src, fs::path dest)
251251
{
252-
#ifdef __MINGW64__
253-
// This is a workaround for a bug in libstdc++ which
254-
// implements fs::rename with _wrename function.
255-
// This bug has been fixed in upstream:
256-
// - GCC 10.3: 8dd1c1085587c9f8a21bb5e588dfe1e8cdbba79e
257-
// - GCC 11.1: 1dfd95f0a0ca1d9e6cbc00e6cbfd1fa20a98f312
258-
// For more details see the commits mentioned above.
259-
return MoveFileExW(src.wstring().c_str(), dest.wstring().c_str(),
260-
MOVEFILE_REPLACE_EXISTING) != 0;
261-
#else
262252
std::error_code error;
263253
fs::rename(src, dest, error);
264254
return !error;
265-
#endif
266255
}
267256

268257
/**

0 commit comments

Comments
 (0)