highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 10:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24521: build: Fix Boost.Process detection on macOS arm64

Browse Source 
1d4157a42b build: Fix Boost.Process detection on macOS arm64 (Hennadii Stepanov)

Pull request description:

  Could be tested as follows:
  ```
  % brew install boost@1.76
  % ./autogen.sh
  % ./configure --with-boost='/opt/homebrew/opt/boost@1.76'
  ```

ACKs for top commit:
  promag:
    Tested ACK on 1d4157a42b with boost 1.76 on macOS arm64. #24523 is required for boost 1.78.

Tree-SHA512: 7abd39a78e970ecc051e53b5923dfc31d3f0576cf4ff7fcfb9c8708c857c46a7a595ec36238def83f41158970eeee209980da4b8b70f0ff68f940a38ac9a0471
This commit is contained in:
fanquake
2022-03-11 10:23:20 +00:00
parent 93feabcb30 1d4157a42b
commit f661da70b9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -1446,6 +1446,8 @@ if test "$use_external_signer" != "no"; then
;; ;;
*) *)
AC_MSG_CHECKING([whether Boost.Process can be used]) AC_MSG_CHECKING([whether Boost.Process can be used])
TEMP_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
TEMP_LDFLAGS="$LDFLAGS" TEMP_LDFLAGS="$LDFLAGS"
dnl Boost 1.73 and older require the following workaround. dnl Boost 1.73 and older require the following workaround.
LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
@ -1453,6 +1455,7 @@ if test "$use_external_signer" != "no"; then
[have_boost_process="yes"], [have_boost_process="yes"],
[have_boost_process="no"]) [have_boost_process="no"])
LDFLAGS="$TEMP_LDFLAGS" LDFLAGS="$TEMP_LDFLAGS"
CPPFLAGS="$TEMP_CPPFLAGS"
AC_MSG_RESULT([$have_boost_process]) AC_MSG_RESULT([$have_boost_process])
if test "$have_boost_process" = "yes"; then if test "$have_boost_process" = "yes"; then
use_external_signer="yes" use_external_signer="yes"