Skip to content

Commit 07bd597

Browse files
kwvgPastaPastaPasta
kwvg
authored and
PastaPastaPasta
committed
partial bitcoin#23511: require glibc 2.18+
1 parent d37f30c commit 07bd597

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

‎configure.ac‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ CXXFLAGS="$TEMP_CXXFLAGS"
586586

587587
fi
588588

589-
CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
589+
CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO"
590590

591591
AC_ARG_WITH([utils],
592592
[AS_HELP_STRING([--with-utils],
@@ -994,9 +994,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
994994
]
995995
)
996996

997-
dnl thread_local is currently disabled when building with glibc back compat.
998-
dnl Our minimum supported glibc is 2.17, however support for thread_local
999-
dnl did not arrive in glibc until 2.18.
1000997
if test "x$use_thread_local" = xyes || { test "x$use_thread_local" = xauto && test "x$use_glibc_compat" = xno; }; then
1001998
TEMP_LDFLAGS="$LDFLAGS"
1002999
LDFLAGS="$TEMP_LDFLAGS $PTHREAD_CFLAGS"

‎contrib/devtools/symbol-check.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,31 @@
1818

1919
import pixie
2020

21-
# Debian 8 (Jessie) EOL: 2020. https://wiki.debian.org/DebianReleases#Production_Releases
21+
# Debian 9 (Stretch) EOL: 2022. https://wiki.debian.org/DebianReleases#Production_Releases
2222
#
23-
# - g++ version 4.9.2 (https://packages.debian.org/search?suite=jessie&arch=any&searchon=names&keywords=g%2B%2B)
24-
# - libc version 2.19 (https://packages.debian.org/search?suite=jessie&arch=any&searchon=names&keywords=libc6)
23+
# - g++ version 6.3.0 (https://packages.debian.org/search?suite=stretch&arch=any&searchon=names&keywords=g%2B%2B)
24+
# - libc version 2.24 (https://packages.debian.org/search?suite=stretch&arch=any&searchon=names&keywords=libc6)
2525
#
26-
# Ubuntu 16.04 (Xenial) EOL: 2024. https://wiki.ubuntu.com/Releases
26+
# Ubuntu 16.04 (Xenial) EOL: 2026. https://wiki.ubuntu.com/Releases
2727
#
28-
# - g++ version 5.3.1 (https://packages.ubuntu.com/search?keywords=g%2B%2B&searchon=names&suite=xenial&section=all)
29-
# - libc version 2.23.0 (https://packages.ubuntu.com/search?keywords=libc6&searchon=names&suite=xenial&section=all)
28+
# - g++ version 5.3.1
29+
# - libc version 2.23
3030
#
31-
# CentOS 7 EOL: 2024. https://wiki.centos.org/FAQ/General
31+
# CentOS Stream 8 EOL: 2024. https://wiki.centos.org/About/Product
3232
#
33-
# - g++ version 4.8.5 (http://mirror.centos.org/centos/7/os/x86_64/Packages/)
34-
# - libc version 2.17 (http://mirror.centos.org/centos/7/os/x86_64/Packages/)
35-
#
36-
# Taking the minimum of these as our target.
37-
#
38-
# According to GNU ABI document (https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html) this corresponds to:
39-
# GCC 4.8.5: GCC_4.8.0
40-
# (glibc) GLIBC_2_17
33+
# - g++ version 8.5.0 (http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/)
34+
# - libc version 2.28 (http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/)
4135
#
36+
# See https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html for more info.
37+
4238
MAX_VERSIONS = {
4339
'GCC': (4,8,0),
4440
'GLIBC': {
45-
pixie.EM_386: (2,17),
46-
pixie.EM_X86_64: (2,17),
47-
pixie.EM_ARM: (2,17),
48-
pixie.EM_AARCH64:(2,17),
49-
pixie.EM_PPC64: (2,17),
41+
pixie.EM_386: (2,18),
42+
pixie.EM_X86_64: (2,18),
43+
pixie.EM_ARM: (2,18),
44+
pixie.EM_AARCH64:(2,18),
45+
pixie.EM_PPC64: (2,18),
5046
pixie.EM_RISCV: (2,27),
5147
},
5248
'LIBATOMIC': (1,0),

‎doc/dependencies.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ These are the dependencies currently used by Dash Core. You can find instruction
1313
| fontconfig | [2.12.1](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | |
1414
| FreeType | [2.7.1](https://download.savannah.gnu.org/releases/freetype) | | No | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Android only) |
1515
| GCC | | [7+](https://gcc.gnu.org/) (C++17 support) | | | |
16+
| glibc | | [2.18](https://www.gnu.org/software/libc/) | | | | |
1617
| HarfBuzz-NG | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |
1718
| libevent | [2.1.11-stable](https://github.com/libevent/libevent/releases) | No | | |
1819
| libnatpmp | git commit [4536032...](https://github.com/miniupnp/libnatpmp/tree/4536032ae32268a45c073a4d5e91bbab4534773a) | | No | | |

0 commit comments

Comments
 (0)