Skip to content

Commit 0433608

Browse files
committed
Merge #21182: build: remove mostly pointless BOOST_PROCESS macro
7bf04e3 build: remove mostly pointless BOOST_PROCESS macro (fanquake) Pull request description: Performing a series of link checks for a Boost component that is header-only doesn't make much sense, and currently means we just have another confusing Boost macro in our tree. I'm not sure why this was originally done this way; maybe Sjors or luke-jr can elaborate (#15382 (929cda5))? The macro also has the side-effect of producing confusing error messages. i.e in #20744, the CI is currently failing with: ```bash checking for boostlib >= 1.58.0 (105800) lib path in "/tmp/cirrus-ci-build/depends/x86_64-pc-linux-gnu/lib"... yes checking for boostlib >= 1.58.0 (105800)... yes checking whether the Boost::Process library is available... yes configure: error: Could not find a version of the Boost::Process library! ``` This isn't useful, given there is no such thing as a `Boost::Process` library. This PR just removes the macro entirely, but maintains a `--with-boost-process` (defaulting to off), flag to configure. Hopefully this will also be removed, in favour of `--enable/disable-external-signer` if/when #16546 is merged. ACKs for top commit: laanwj: ACK 7bf04e3 Tree-SHA512: b270a0250f32df2078f986c165b8977967d8c06df80bf2773f3442f74b395a3bfa6544af1024d9b6524d90d47a0f6304194b3aced0e2ecb88e75916da945ccb6
2 parents 4dc1ff8 + 7bf04e3 commit 0433608

File tree

2 files changed

+15
-124
lines changed

2 files changed

+15
-124
lines changed

build-aux/m4/ax_boost_process.m4

-121
This file was deleted.

configure.ac

+15-3
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ AC_ARG_ENABLE([werror],
338338
[enable_werror=$enableval],
339339
[enable_werror=no])
340340

341+
AC_ARG_WITH([boost-process],
342+
[AS_HELP_STRING([--with-boost-process],[Opt in to using Boost Process (default is no)])],
343+
[boost_process=$withval],
344+
[boost_process=no])
345+
341346
AC_LANG_PUSH([C++])
342347

343348
dnl Check for a flag to turn compiler warnings into errors. This is helpful for checks which may
@@ -1388,8 +1393,15 @@ fi
13881393
AX_BOOST_SYSTEM
13891394
AX_BOOST_FILESYSTEM
13901395

1391-
dnl Opt-in to boost-process
1392-
AS_IF([ test x$with_boost_process != x ], [ AX_BOOST_PROCESS ], [ ax_cv_boost_process=no ] )
1396+
dnl Opt-in to Boost Process
1397+
if test "x$boost_process" != xno; then
1398+
AC_MSG_CHECKING(for Boost Process)
1399+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]],
1400+
[[ boost::process::child* child = new boost::process::child; delete child; ]])],
1401+
[ AC_MSG_RESULT(yes); AC_DEFINE([HAVE_BOOST_PROCESS],,[define if Boost::Process is available])],
1402+
[ AC_MSG_ERROR([Boost::Process is not available!])]
1403+
)
1404+
fi
13931405

13941406
if test x$suppress_external_warnings != xno; then
13951407
BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
@@ -1876,7 +1888,7 @@ esac
18761888

18771889
echo
18781890
echo "Options used to compile and link:"
1879-
echo " boost process = $ax_cv_boost_process"
1891+
echo " boost process = $with_boost_process"
18801892
echo " multiprocess = $build_multiprocess"
18811893
echo " with libs = $build_bitcoin_libs"
18821894
echo " with wallet = $enable_wallet"

0 commit comments

Comments
 (0)