Skip to content

Commit 3984614

Browse files
hebastohebasto
committed
Merge #174: Sync with the main repo
Pull request description: Sync with the main repo up to the latest bitcoin/bitcoin@d76a423. No merge conflicts. Guix build on `x86_64`: ``` 4f9abf771fe2ddb777df3f63830ac9a373befc3498449aac1140ed50dde93951 guix-build-6eb6aae5080f/output/aarch64-linux-gnu/SHA256SUMS.part 7d5f51c5dd3ccd1f171e8aeff38c0a23967c021a74b260cace74877037fd7234 guix-build-6eb6aae5080f/output/aarch64-linux-gnu/bitcoin-6eb6aae5080f-aarch64-linux-gnu-debug.tar.gz d55edaf12c3b81e133ac1bf8b4aaf32c3a9abc385aa360bc9477f733c7772b5c guix-build-6eb6aae5080f/output/aarch64-linux-gnu/bitcoin-6eb6aae5080f-aarch64-linux-gnu.tar.gz baa6b7608a75d72d33ab865608b8456b080b678f4a4b6ff22a8574180a0dfc14 guix-build-6eb6aae5080f/output/arm-linux-gnueabihf/SHA256SUMS.part fec06d9333938f5de954b59e76a072c213caf82e191ca8a354385d241801e1f5 guix-build-6eb6aae5080f/output/arm-linux-gnueabihf/bitcoin-6eb6aae5080f-arm-linux-gnueabihf-debug.tar.gz ecbe4e619c8319098f45bdfc5bc58d687f38f9895900fb6621a3abab51d1c172 guix-build-6eb6aae5080f/output/arm-linux-gnueabihf/bitcoin-6eb6aae5080f-arm-linux-gnueabihf.tar.gz 65b546de0ecfff3f4da213b733b2996e2c24598e00af5912d002bf812ac320cb guix-build-6eb6aae5080f/output/arm64-apple-darwin/SHA256SUMS.part 442a88bda61848735a82411f7974544b865c72d0c06f08fbb1a36b161c33c5d7 guix-build-6eb6aae5080f/output/arm64-apple-darwin/bitcoin-6eb6aae5080f-arm64-apple-darwin-unsigned.dmg c0178ecea52113d196b8c25fd32e91a12e0482f9f73d658c519ba34472bcc471 guix-build-6eb6aae5080f/output/arm64-apple-darwin/bitcoin-6eb6aae5080f-arm64-apple-darwin-unsigned.tar.gz 7400c7567300404022c55fa7f09b535d4408ac6dc2d786716355177135a77347 guix-build-6eb6aae5080f/output/arm64-apple-darwin/bitcoin-6eb6aae5080f-arm64-apple-darwin.tar.gz c4a9373cc740193e1def3cecd2d22986d01fb6fab512a5eb44ea5df0fa854bcd guix-build-6eb6aae5080f/output/dist-archive/bitcoin-6eb6aae5080f.tar.gz 36456605c7a90d484ef6886be37d263409f50ea34027eca713bb55479b569dfa guix-build-6eb6aae5080f/output/powerpc64-linux-gnu/SHA256SUMS.part 05ee9a78f77ed76611304b84f4f6dce360eec1ea34317ed11cae06912e90e1c4 guix-build-6eb6aae5080f/output/powerpc64-linux-gnu/bitcoin-6eb6aae5080f-powerpc64-linux-gnu-debug.tar.gz 0cb7f7f93236c001e3a93a915b2e2b3925b3bf9107375f45528235c470bbb229 guix-build-6eb6aae5080f/output/powerpc64-linux-gnu/bitcoin-6eb6aae5080f-powerpc64-linux-gnu.tar.gz 554043e1c01ef322ef7140532848dc4e565c96eb0215e9c0ba23d0f3fc6622e1 guix-build-6eb6aae5080f/output/powerpc64le-linux-gnu/SHA256SUMS.part d6ea28e5c27691da92fc6fb7f2d2d61f7722e441f87b2717ef87e06fc664ac8c guix-build-6eb6aae5080f/output/powerpc64le-linux-gnu/bitcoin-6eb6aae5080f-powerpc64le-linux-gnu-debug.tar.gz 6e7fa9eb187f7fa08516473298fe329de5aa2f0c5bb736e890c41d559945078f guix-build-6eb6aae5080f/output/powerpc64le-linux-gnu/bitcoin-6eb6aae5080f-powerpc64le-linux-gnu.tar.gz 7b4182211cbabf49af2943018b45063dd022dae56915d33f07c129c37696ccfa guix-build-6eb6aae5080f/output/riscv64-linux-gnu/SHA256SUMS.part 6ceea478a85b5e66b82f51e5074961e8745204ccb112b71f2582c6e3381d343c guix-build-6eb6aae5080f/output/riscv64-linux-gnu/bitcoin-6eb6aae5080f-riscv64-linux-gnu-debug.tar.gz 0436946c03ec416022ca34362ecbfe88c12344ad98f01f23362bee08f337d728 guix-build-6eb6aae5080f/output/riscv64-linux-gnu/bitcoin-6eb6aae5080f-riscv64-linux-gnu.tar.gz c3d64e2f6ea073add3b72187cebe37d8f86af39844e91af09bcadad49d82fba8 guix-build-6eb6aae5080f/output/x86_64-apple-darwin/SHA256SUMS.part 2faaa084edd8fa495ef2dca68015bdb49630ff1c1414d133d972bab9b22e7ae0 guix-build-6eb6aae5080f/output/x86_64-apple-darwin/bitcoin-6eb6aae5080f-x86_64-apple-darwin-unsigned.dmg de1038050313045d08eb08b257ec2a2f7697cd2c8e9f08fd0b3da6da422f00db guix-build-6eb6aae5080f/output/x86_64-apple-darwin/bitcoin-6eb6aae5080f-x86_64-apple-darwin-unsigned.tar.gz 50ad7608a74266bc409aaff206a3bccc38313ff62661cfc58fcbb05795a56536 guix-build-6eb6aae5080f/output/x86_64-apple-darwin/bitcoin-6eb6aae5080f-x86_64-apple-darwin.tar.gz 57740566923cac355a3383d1ba3f02999d438de1a4ad599c6cb6f9a2fb2162c9 guix-build-6eb6aae5080f/output/x86_64-linux-gnu/SHA256SUMS.part ef2e27ffc48e56c4db395ae6af330f1a739bb8e21f00aa57ce79ac5b8d0151f1 guix-build-6eb6aae5080f/output/x86_64-linux-gnu/bitcoin-6eb6aae5080f-x86_64-linux-gnu-debug.tar.gz a84a87622433d1750d2bd02019dba3148b6ff449fc883f74bed93084963c32bd guix-build-6eb6aae5080f/output/x86_64-linux-gnu/bitcoin-6eb6aae5080f-x86_64-linux-gnu.tar.gz e21c3e6f7930a085af8f4cd7755d73214702f96c7625c001b21901f0a522b7da guix-build-6eb6aae5080f/output/x86_64-w64-mingw32/SHA256SUMS.part 02251a57aa71069a7d9b35c8f7e055738f5bd4ef2c3b6e193e75cacebb86cba2 guix-build-6eb6aae5080f/output/x86_64-w64-mingw32/bitcoin-6eb6aae5080f-win64-debug.zip 6e61e2c1f2688a02e5314bed594d6dccfaecab671a8ed32fb0dd479d1ea7ed75 guix-build-6eb6aae5080f/output/x86_64-w64-mingw32/bitcoin-6eb6aae5080f-win64-setup-unsigned.exe 0f077749c162d35f8f75f86ca7cd2e071261167b1d55074e31352be9f942e6a4 guix-build-6eb6aae5080f/output/x86_64-w64-mingw32/bitcoin-6eb6aae5080f-win64-unsigned.tar.gz 234946da0725d782bfc6fd8f0a3f665e8233c27d6eb31ebc51fba0149f1fd3f9 guix-build-6eb6aae5080f/output/x86_64-w64-mingw32/bitcoin-6eb6aae5080f-win64.zip ``` [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/174) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/174) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/174) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/174) ACKs for top commit: jarolrod: ACK 6eb6aae Tree-SHA512: 8c8cf2d3a36080ba63d0ed0b1ba510f39599a229f23fa2c55110a78e33700848b224f2a495618598476d45289964fb80c3945a6a251c30faf7e0c95da5d92d94
2 parents 69069b5 + 6eb6aae commit 3984614

File tree

308 files changed

+10639
-4403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+10639
-4403
lines changed

‎.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ task:
9797
name: "Win64 native [vs2022]"
9898
<< : *FILTER_TEMPLATE
9999
windows_container:
100-
cpu: 4
101-
memory: 8G
100+
cpu: 6
101+
memory: 12G
102102
image: cirrusci/windowsservercore:visualstudio2022
103103
timeout_in: 120m
104104
env:
@@ -162,7 +162,7 @@ task:
162162
ccache_cache:
163163
folder: '%CCACHE_DIR%'
164164
install_tools_script:
165-
- choco install --yes --no-progress ccache
165+
- choco install --yes --no-progress ccache --version=4.6.1
166166
- choco install --yes --no-progress python3 --version=3.9.6
167167
- pip install zmq
168168
- ccache --version

‎Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ endif
2323

2424
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
2525
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
26+
BITCOIN_TEST_BIN=$(top_builddir)/src/test/$(BITCOIN_TEST_NAME)$(EXEEXT)
2627
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
2728
BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
2829
BITCOIN_UTIL_BIN=$(top_builddir)/src/$(BITCOIN_UTIL_NAME)$(EXEEXT)
@@ -78,6 +79,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
7879
$(MKDIR_P) $(top_builddir)/release
7980
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
8081
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
82+
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TEST_BIN) $(top_builddir)/release
8183
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
8284
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
8385
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release

‎SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ The following keys may be used to communicate sensitive information to developer
1313

1414
| Name | Fingerprint |
1515
|------|-------------|
16-
| Wladimir van der Laan | 71A3 B167 3540 5025 D447 E8F2 7481 0B01 2346 C9A6 |
1716
| Pieter Wuille | 133E AC17 9436 F14A 5CF1 B794 860F EB80 4E66 9320 |
1817
| Michael Ford | E777 299F C265 DD04 7930 70EB 944D 35F9 AC3D B76A |
18+
| Andrew Chow | 1528 1230 0785 C964 44D3 334D 1756 5732 E08E 5E41 |
1919

2020
You can import a key by running the following command with that individual’s fingerprint: `gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.

‎build-aux/m4/ax_boost_base.m4

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
# Test for the Boost C++ libraries of a particular version (or newer)
1212
#
1313
# If no path to the installed boost library is given the macro searchs
14-
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates the
15-
# $BOOST_ROOT environment variable. Further documentation is available at
16-
# <http://randspringer.de/boost/index.html>.
14+
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
15+
# the $BOOST_ROOT environment variable. Further documentation is available
16+
# at <http://randspringer.de/boost/index.html>.
1717
#
1818
# This macro calls:
1919
#
@@ -33,7 +33,7 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 48
36+
#serial 51
3737

3838
# example boost program (need to pass version)
3939
m4_define([_AX_BOOST_BASE_PROGRAM],
@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
114114
AS_CASE([${host_cpu}],
115115
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
116116
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
117-
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"],
117+
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
118118
[libsubdirs="lib"]
119119
)
120120
@@ -128,7 +128,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
128128
)
129129
130130
dnl first we check the system location for boost libraries
131-
dnl this location ist chosen if boost libraries are installed with the --layout=system option
131+
dnl this location is chosen if boost libraries are installed with the --layout=system option
132132
dnl or if you install boost with RPM
133133
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
134134
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
@@ -151,7 +151,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
151151
else
152152
search_libsubdirs="$multiarch_libsubdir $libsubdirs"
153153
fi
154-
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew/; do
154+
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do
155155
if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then
156156
for libsubdir in $search_libsubdirs ; do
157157
if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi

‎build_msvc/common.init.vcxproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<AdditionalOptions>/utf-8 /Zc:__cplusplus /std:c++20 %(AdditionalOptions)</AdditionalOptions>
9191
<DisableSpecificWarnings>4018;4244;4267;4334;4715;4805;4834</DisableSpecificWarnings>
9292
<TreatWarningAsError>true</TreatWarningAsError>
93-
<PreprocessorDefinitions>_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<AdditionalIncludeDirectories>..\..\src;..\..\src\minisketch\include;..\..\src\univalue\include;..\..\src\secp256k1\include;..\..\src\leveldb\include;..\..\src\leveldb\helpers\memenv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9595
</ClCompile>
9696
<Link>

‎ci/test/06_script_b.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
6565
" src/util/serfloat.cpp"\
6666
" src/util/spanparsing.cpp"\
6767
" src/util/strencodings.cpp"\
68+
" src/util/string.cpp"\
6869
" src/util/syserror.cpp"\
6970
" src/util/url.cpp"\
7071
" -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"

‎configure.ac

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.69])
2-
define(_CLIENT_VERSION_MAJOR, 23)
2+
define(_CLIENT_VERSION_MAJOR, 24)
33
define(_CLIENT_VERSION_MINOR, 99)
44
define(_CLIENT_VERSION_BUILD, 0)
55
define(_CLIENT_VERSION_RC, 0)
@@ -31,6 +31,7 @@ fi
3131

3232
BITCOIN_DAEMON_NAME=bitcoind
3333
BITCOIN_GUI_NAME=bitcoin-qt
34+
BITCOIN_TEST_NAME=test_bitcoin
3435
BITCOIN_CLI_NAME=bitcoin-cli
3536
BITCOIN_TX_NAME=bitcoin-tx
3637
BITCOIN_UTIL_NAME=bitcoin-util
@@ -518,7 +519,7 @@ if test "$enable_clmul" = "yes"; then
518519
fi
519520

520521
TEMP_CXXFLAGS="$CXXFLAGS"
521-
CXXFLAGS="$CXXFLAGS $SSE42_CXXFLAGS"
522+
CXXFLAGS="$SSE42_CXXFLAGS $CXXFLAGS"
522523
AC_MSG_CHECKING([for SSE4.2 intrinsics])
523524
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
524525
#include <stdint.h>
@@ -540,7 +541,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
540541
CXXFLAGS="$TEMP_CXXFLAGS"
541542

542543
TEMP_CXXFLAGS="$CXXFLAGS"
543-
CXXFLAGS="$CXXFLAGS $SSE41_CXXFLAGS"
544+
CXXFLAGS="$SSE41_CXXFLAGS $CXXFLAGS"
544545
AC_MSG_CHECKING([for SSE4.1 intrinsics])
545546
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
546547
#include <stdint.h>
@@ -555,7 +556,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
555556
CXXFLAGS="$TEMP_CXXFLAGS"
556557

557558
TEMP_CXXFLAGS="$CXXFLAGS"
558-
CXXFLAGS="$CXXFLAGS $AVX2_CXXFLAGS"
559+
CXXFLAGS="$AVX2_CXXFLAGS $CXXFLAGS"
559560
AC_MSG_CHECKING([for AVX2 intrinsics])
560561
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
561562
#include <stdint.h>
@@ -570,7 +571,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
570571
CXXFLAGS="$TEMP_CXXFLAGS"
571572

572573
TEMP_CXXFLAGS="$CXXFLAGS"
573-
CXXFLAGS="$CXXFLAGS $X86_SHANI_CXXFLAGS"
574+
CXXFLAGS="$X86_SHANI_CXXFLAGS $CXXFLAGS"
574575
AC_MSG_CHECKING([for x86 SHA-NI intrinsics])
575576
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
576577
#include <stdint.h>
@@ -591,7 +592,7 @@ AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_CRC_CXXFLAGS="-march=arm
591592
AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_SHANI_CXXFLAGS="-march=armv8-a+crc+crypto"], [], [$CXXFLAG_WERROR])
592593

593594
TEMP_CXXFLAGS="$CXXFLAGS"
594-
CXXFLAGS="$CXXFLAGS $ARM_CRC_CXXFLAGS"
595+
CXXFLAGS="$ARM_CRC_CXXFLAGS $CXXFLAGS"
595596
AC_MSG_CHECKING([for ARMv8 CRC32 intrinsics])
596597
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
597598
#include <arm_acle.h>
@@ -610,7 +611,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
610611
CXXFLAGS="$TEMP_CXXFLAGS"
611612

612613
TEMP_CXXFLAGS="$CXXFLAGS"
613-
CXXFLAGS="$CXXFLAGS $ARM_SHANI_CXXFLAGS"
614+
CXXFLAGS="$ARM_SHANI_CXXFLAGS $CXXFLAGS"
614615
AC_MSG_CHECKING([for ARMv8 SHA-NI intrinsics])
615616
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
616617
#include <arm_acle.h>
@@ -745,6 +746,16 @@ case $host in
745746
dnl It's safe to add these paths even if the functionality is disabled by
746747
dnl the user (--without-wallet or --without-gui for example).
747748

749+
dnl Homebrew may create symlinks in /usr/local/include for some packages.
750+
dnl Because MacOS's clang internally adds "-I /usr/local/include" to its search
751+
dnl paths, this will negate efforts to use -isystem for those packages, as they
752+
dnl will be found first in /usr/local. Use the internal "-internal-isystem"
753+
dnl option to system-ify all /usr/local/include paths without adding it to the list
754+
dnl of search paths in case it's not already there.
755+
if test "$suppress_external_warnings" != "no"; then
756+
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem/usr/local/include], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem/usr/local/include"], [], [$CXXFLAG_WERROR])
757+
fi
758+
748759
if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then
749760
bdb_prefix=$($BREW --prefix berkeley-db@4 2>/dev/null)
750761
dnl This must precede the call to BITCOIN_FIND_BDB48 below.
@@ -1694,11 +1705,12 @@ AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"])
16941705
AC_MSG_RESULT($build_bitcoin_util)
16951706

16961707
AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate])
1697-
if test "$build_experimental_kernel_lib" = "no"; then
1698-
AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]);
1699-
else
1700-
AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"])
1708+
if test "$build_bitcoin_chainstate" = "yes"; then
1709+
if test "$build_experimental_kernel_lib" = "no"; then
1710+
AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]);
1711+
fi
17011712
fi
1713+
AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"])
17021714
AC_MSG_RESULT($build_bitcoin_chainstate)
17031715

17041716
AC_MSG_CHECKING([whether to build libraries])
@@ -1921,6 +1933,7 @@ AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
19211933
AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
19221934
AC_SUBST(BITCOIN_DAEMON_NAME)
19231935
AC_SUBST(BITCOIN_GUI_NAME)
1936+
AC_SUBST(BITCOIN_TEST_NAME)
19241937
AC_SUBST(BITCOIN_CLI_NAME)
19251938
AC_SUBST(BITCOIN_TX_NAME)
19261939
AC_SUBST(BITCOIN_UTIL_NAME)

‎contrib/devtools/gen-manpages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
for relpath in BINARIES:
3737
abspath = os.path.join(builddir, relpath)
3838
try:
39-
r = subprocess.run([abspath, '--version'], stdout=subprocess.PIPE, universal_newlines=True)
39+
r = subprocess.run([abspath, "--version"], stdout=subprocess.PIPE, check=True, universal_newlines=True)
4040
except IOError:
4141
print(f'{abspath} not found or not an executable', file=sys.stderr)
4242
sys.exit(1)

‎contrib/devtools/symbol-check.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
MAX_VERSIONS = {
3636
'GCC': (4,8,0),
3737
'GLIBC': {
38-
lief.ELF.ARCH.i386: (2,18),
3938
lief.ELF.ARCH.x86_64: (2,18),
4039
lief.ELF.ARCH.ARM: (2,18),
4140
lief.ELF.ARCH.AARCH64:(2,18),
@@ -45,8 +44,6 @@
4544
'LIBATOMIC': (1,0),
4645
'V': (0,5,0), # xkb (bitcoin-qt only)
4746
}
48-
# See here for a description of _IO_stdin_used:
49-
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109
5047

5148
# Ignore symbols that are exported as part of every executable
5249
IGNORE_EXPORTS = {
@@ -57,9 +54,6 @@
5754
# Expected linker-loader names can be found here:
5855
# https://sourceware.org/glibc/wiki/ABIList?action=recall&rev=16
5956
ELF_INTERPRETER_NAMES: Dict[lief.ELF.ARCH, Dict[lief.ENDIANNESS, str]] = {
60-
lief.ELF.ARCH.i386: {
61-
lief.ENDIANNESS.LITTLE: "/lib/ld-linux.so.2",
62-
},
6357
lief.ELF.ARCH.x86_64: {
6458
lief.ENDIANNESS.LITTLE: "/lib64/ld-linux-x86-64.so.2",
6559
},

‎contrib/guix/INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ writing (July 2021). Guix is expected to be more widely packaged over time. For
7272
an up-to-date view on Guix's package status/version across distros, please see:
7373
https://repology.org/project/guix/versions
7474

75-
### Debian 11 (Bullseye)/Ubuntu 21.04 (Hirsute Hippo)
75+
### Debian / Ubuntu
7676

7777
Guix v1.2.0 is available as a distribution package starting in [Debian
7878
11](https://packages.debian.org/bullseye/guix) and [Ubuntu
79-
21.04](https://packages.ubuntu.com/hirsute/guix).
79+
21.04](https://packages.ubuntu.com/search?keywords=guix).
8080

8181
Note that if you intend on using Guix without using any substitutes (more
8282
details [here][security-model]), v1.2.0 has a known problem when building GnuTLS

0 commit comments

Comments
 (0)