mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
build: Fix Boost.Process test for Boost 1.78
This commit is contained in:
parent
c109e7d51c
commit
532c64a726
3 changed files with 23 additions and 0 deletions
|
@ -1446,6 +1446,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"
|
||||
|
@ -1456,6 +1460,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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Add table
Reference in a new issue