File tree 3 files changed +23
-0
lines changed
3 files changed +23
-0
lines changed Original file line number Diff line number Diff line change @@ -1446,6 +1446,10 @@ if test "$use_external_signer" != "no"; then
1446
1446
;;
1447
1447
*)
1448
1448
AC_MSG_CHECKING ( [ whether Boost.Process can be used] )
1449
+ TEMP_CXXFLAGS="$CXXFLAGS"
1450
+ dnl Boost 1.78 requires the following workaround.
1451
+ dnl See: https://github.com/boostorg/process/issues/235
1452
+ CXXFLAGS="$CXXFLAGS -Wno-error=narrowing"
1449
1453
TEMP_CPPFLAGS="$CPPFLAGS"
1450
1454
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1451
1455
TEMP_LDFLAGS="$LDFLAGS"
@@ -1456,6 +1460,7 @@ if test "$use_external_signer" != "no"; then
1456
1460
[ have_boost_process="no"] )
1457
1461
LDFLAGS="$TEMP_LDFLAGS"
1458
1462
CPPFLAGS="$TEMP_CPPFLAGS"
1463
+ CXXFLAGS="$TEMP_CXXFLAGS"
1459
1464
AC_MSG_RESULT ( [ $have_boost_process] )
1460
1465
if test "$have_boost_process" = "yes"; then
1461
1466
use_external_signer="yes"
Original file line number Diff line number Diff line change 12
12
// For details see https://github.com/bitcoin/bitcoin/pull/22348.
13
13
#define __kernel_entry
14
14
#endif
15
+ #if defined(__GNUC__)
16
+ // Boost 1.78 requires the following workaround.
17
+ // See: https://github.com/boostorg/process/issues/235
18
+ #pragma GCC diagnostic push
19
+ #pragma GCC diagnostic ignored "-Wnarrowing"
20
+ #endif
15
21
#include < boost/process.hpp>
22
+ #if defined(__GNUC__)
23
+ #pragma GCC diagnostic pop
24
+ #endif
16
25
#endif // ENABLE_EXTERNAL_SIGNER
17
26
18
27
#include < boost/test/unit_test.hpp>
Original file line number Diff line number Diff line change 6
6
#include < util/system.h>
7
7
8
8
#ifdef ENABLE_EXTERNAL_SIGNER
9
+ #if defined(__GNUC__)
10
+ // Boost 1.78 requires the following workaround.
11
+ // See: https://github.com/boostorg/process/issues/235
12
+ #pragma GCC diagnostic push
13
+ #pragma GCC diagnostic ignored "-Wnarrowing"
14
+ #endif
9
15
#include < boost/process.hpp>
16
+ #if defined(__GNUC__)
17
+ #pragma GCC diagnostic pop
18
+ #endif
10
19
#endif // ENABLE_EXTERNAL_SIGNER
11
20
12
21
#include < chainparamsbase.h>
You can’t perform that action at this time.
0 commit comments