diff options
| -rwxr-xr-x | ci/test/00_setup_env_win64.sh | 2 | ||||
| -rwxr-xr-x | ci/test/06_script_a.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 25aa682eb0..3f43bf227b 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -13,4 +13,4 @@ export DPKG_ADD_ARCH="i386" export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file" export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" -export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" +export BITCOIN_CONFIG="--enable-reduce-exports --disable-external-signer --disable-gui-tests" diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index d5f1ca273a..7158b69b4e 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -14,7 +14,7 @@ if [ -n "$ANDROID_TOOLS_URL" ]; then exit 0 fi -BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib" +BITCOIN_CONFIG_ALL="--enable-external-signer --enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib" if [ -z "$NO_WERROR" ]; then BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror" fi diff --git a/configure.ac b/configure.ac index ae21dd9a7c..1e6ac93e78 100644 --- a/configure.ac +++ b/configure.ac @@ -359,7 +359,7 @@ esac if test "$enable_debug" = "yes"; then dnl Clear default -g -O2 flags if test "$CXXFLAGS_overridden" = "no"; then - CXXFLAGS="" + CXXFLAGS="" fi dnl Disable all optimizations @@ -978,14 +978,14 @@ AC_CHECK_DECLS([setsid]) AC_CHECK_DECLS([pipe2]) AC_CHECK_DECLS([le16toh, le32toh, le64toh, htole16, htole32, htole64, be16toh, be32toh, be64toh, htobe16, htobe32, htobe64],,, - [#if HAVE_ENDIAN_H + [#if HAVE_ENDIAN_H #include <endian.h> #elif HAVE_SYS_ENDIAN_H #include <sys/endian.h> #endif]) AC_CHECK_DECLS([bswap_16, bswap_32, bswap_64],,, - [#if HAVE_BYTESWAP_H + [#if HAVE_BYTESWAP_H #include <byteswap.h> #endif]) @@ -1438,11 +1438,15 @@ if test "$use_external_signer" != "no"; then ;; *) AC_MSG_CHECKING([whether Boost.Process can be used]) + TEMP_LDFLAGS="$LDFLAGS" + dnl Boost 1.73 and older require the following workaround. + LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]])], [have_boost_process="yes"], [have_boost_process="no"]) + LDFLAGS="$TEMP_LDFLAGS" AC_MSG_RESULT([$have_boost_process]) - if test "$have_boost_process" == "yes"; then + if test "$have_boost_process" = "yes"; then use_external_signer="yes" AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled]) else |