diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-02-22 12:20:48 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2022-03-31 10:38:09 +0200 |
| commit | ded10fe3eae2ad8058d0cc8f1cee1ad1d34bb507 (patch) | |
| tree | 6c72ac046e1c30ddfe870ed9dbb44774ade2c842 | |
| parent | 26c2f23f36228e334d17c43a0cb61f76cc545c3d (diff) | |
| download | bitcoin-ded10fe3eae2ad8058d0cc8f1cee1ad1d34bb507.tar.xz | |
build: Fix Boost.Process test for Boost 1.78
Github-Pull: bitcoin#24523
Rebased-From: 532c64a
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/test/system_tests.cpp | 9 | ||||
| -rw-r--r-- | src/util/system.cpp | 9 |
3 files changed, 23 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8debf98379..c0a982e542 100644 --- a/configure.ac +++ b/configure.ac @@ -1438,6 +1438,10 @@ if test "$use_external_signer" != "no"; then ;; *) AC_MSG_CHECKING([whether Boost.Process can be used]) + TEMP_CXXFLAGS="$CXXFLAGS" + dnl Boost 1.78 requires the following workaround. + dnl See: https://github.com/boostorg/process/issues/235 + CXXFLAGS="$CXXFLAGS -Wno-error=narrowing" TEMP_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" TEMP_LDFLAGS="$LDFLAGS" @@ -1448,6 +1452,7 @@ if test "$use_external_signer" != "no"; then [have_boost_process="no"]) LDFLAGS="$TEMP_LDFLAGS" CPPFLAGS="$TEMP_CPPFLAGS" + CXXFLAGS="$TEMP_CXXFLAGS" AC_MSG_RESULT([$have_boost_process]) if test "$have_boost_process" = "yes"; then use_external_signer="yes" diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index 9c6950f11f..3f5353b5a2 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -12,7 +12,16 @@ // For details see https://github.com/bitcoin/bitcoin/pull/22348. #define __kernel_entry #endif +#if defined(__GNUC__) +// Boost 1.78 requires the following workaround. +// See: https://github.com/boostorg/process/issues/235 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnarrowing" +#endif #include <boost/process.hpp> +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif #endif // ENABLE_EXTERNAL_SIGNER #include <boost/test/unit_test.hpp> diff --git a/src/util/system.cpp b/src/util/system.cpp index aa9122106b..c0f4e8fe4f 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -6,7 +6,16 @@ #include <util/system.h> #ifdef ENABLE_EXTERNAL_SIGNER +#if defined(__GNUC__) +// Boost 1.78 requires the following workaround. +// See: https://github.com/boostorg/process/issues/235 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnarrowing" +#endif #include <boost/process.hpp> +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif #endif // ENABLE_EXTERNAL_SIGNER #include <chainparamsbase.h> |