From e715ff1d37c8e2e07548db0ff0f84d422921e766 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Sat, 11 Oct 2025 17:39:08 -0700 Subject: [PATCH 1/2] Regenerate artifacts. --- install-cmake.sh | 5 ----- install-cmakepresets.sh | 5 ----- install.sh | 5 ----- 3 files changed, 15 deletions(-) diff --git a/install-cmake.sh b/install-cmake.sh index 81cd147..f816084 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -332,11 +332,6 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi - - if [[ ($OS == Darwin) && ($CC == clang*) ]]; then - CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - fi } link_to_standard_library() diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 2f176cd..5db6593 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -340,11 +340,6 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi - - if [[ ($OS == Darwin) && ($CC == clang*) ]]; then - CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - fi } link_to_standard_library() diff --git a/install.sh b/install.sh index 1e10e8b..1db21b6 100755 --- a/install.sh +++ b/install.sh @@ -327,11 +327,6 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi - - if [[ ($OS == Darwin) && ($CC == clang*) ]]; then - CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" - fi } link_to_standard_library() From 61751b743a5a07e41b183f21b89431a2bd8a0dc9 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 13 Oct 2025 13:54:27 -0700 Subject: [PATCH 2/2] Regenerate artifacts. --- install-cmake.sh | 16 ++++++++-------- install-cmakepresets.sh | 16 ++++++++-------- install.sh | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/install-cmake.sh b/install-cmake.sh index f816084..cfa3828 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -59,7 +59,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-protocol" +BUILD_SRC_DIR="build-libbitcoin-protocol" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -166,13 +166,13 @@ make_jobs() shift 1 VERBOSITY="" - if [[ DISPLAY_VERBOSE ]]; then + if [[ $DISPLAY_VERBOSE ]]; then VERBOSITY="VERBOSE=1" fi SEQUENTIAL=1 # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). - if [[ $JOBS > $SEQUENTIAL ]]; then + if [[ $JOBS -gt $SEQUENTIAL ]]; then make -j"$JOBS" "$@" $VERBOSITY else make "$@" $VERBOSITY @@ -278,7 +278,7 @@ parse_command_line_options() (--build-secp256k1) BUILD_SECP256K1="yes";; # Unique script options. - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; # Handle ndebug declarations due to disabled argument passthrough (--enable-ndebug) ENABLE_NDEBUG="yes";; @@ -483,7 +483,7 @@ display_configuration() display_message "BUILD_BOOST : $BUILD_BOOST" display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BOOST_ROOT : $BOOST_ROOT" - display_message "BUILD_DIR : $BUILD_DIR" + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" display_message "PREFIX : $PREFIX" @@ -1065,10 +1065,10 @@ BITCOIN_PROTOCOL_OPTIONS=( display_configuration if [[ ! ($CI == true) ]]; then - create_directory "$BUILD_DIR" - push_directory "$BUILD_DIR" + create_directory "$BUILD_SRC_DIR" + push_directory "$BUILD_SRC_DIR" else - push_directory "$BUILD_DIR" + push_directory "$BUILD_SRC_DIR" fi initialize_git diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 5db6593..e4f5ebf 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -65,7 +65,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-protocol" +BUILD_SRC_DIR="build-libbitcoin-protocol" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -172,13 +172,13 @@ make_jobs() shift 1 VERBOSITY="" - if [[ DISPLAY_VERBOSE ]]; then + if [[ $DISPLAY_VERBOSE ]]; then VERBOSITY="VERBOSE=1" fi SEQUENTIAL=1 # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). - if [[ $JOBS > $SEQUENTIAL ]]; then + if [[ $JOBS -gt $SEQUENTIAL ]]; then make -j"$JOBS" "$@" $VERBOSITY else make "$@" $VERBOSITY @@ -285,7 +285,7 @@ parse_command_line_options() (--build-secp256k1) BUILD_SECP256K1="yes";; # Unique script options. - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--preset=*) PRESET_ID="${OPTION#*=}";; # Handle ndebug declarations due to disabled argument passthrough @@ -518,7 +518,7 @@ display_configuration() display_message "BUILD_BOOST : $BUILD_BOOST" display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BOOST_ROOT : $BOOST_ROOT" - display_message "BUILD_DIR : $BUILD_DIR" + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" display_message "PRESET_ID : $PRESET_ID" display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" @@ -1107,10 +1107,10 @@ BITCOIN_PROTOCOL_OPTIONS=( display_configuration if [[ ! ($CI == true) ]]; then - create_directory "$BUILD_DIR" - push_directory "$BUILD_DIR" + create_directory "$BUILD_SRC_DIR" + push_directory "$BUILD_SRC_DIR" else - push_directory "$BUILD_DIR" + push_directory "$BUILD_SRC_DIR" fi initialize_git diff --git a/install.sh b/install.sh index 1db21b6..ea4d2c0 100755 --- a/install.sh +++ b/install.sh @@ -59,7 +59,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-protocol" +BUILD_SRC_DIR="build-libbitcoin-protocol" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -166,13 +166,13 @@ make_jobs() shift 1 VERBOSITY="" - if [[ DISPLAY_VERBOSE ]]; then + if [[ $DISPLAY_VERBOSE ]]; then VERBOSITY="VERBOSE=1" fi SEQUENTIAL=1 # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). - if [[ $JOBS > $SEQUENTIAL ]]; then + if [[ $JOBS -gt $SEQUENTIAL ]]; then make -j"$JOBS" "$@" $VERBOSITY else make "$@" $VERBOSITY @@ -278,7 +278,7 @@ parse_command_line_options() (--build-secp256k1) BUILD_SECP256K1="yes";; # Unique script options. - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; esac done } @@ -428,7 +428,7 @@ display_configuration() display_message "BUILD_BOOST : $BUILD_BOOST" display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BOOST_ROOT : $BOOST_ROOT" - display_message "BUILD_DIR : $BUILD_DIR" + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" display_message "PREFIX : $PREFIX" display_message "DISABLE_SHARED : $DISABLE_SHARED" display_message "DISABLE_STATIC : $DISABLE_STATIC" @@ -939,10 +939,10 @@ BITCOIN_PROTOCOL_OPTIONS=( display_configuration if [[ ! ($CI == true) ]]; then - create_directory "$BUILD_DIR" - push_directory "$BUILD_DIR" + create_directory "$BUILD_SRC_DIR" + push_directory "$BUILD_SRC_DIR" else - push_directory "$BUILD_DIR" + push_directory "$BUILD_SRC_DIR" fi initialize_git