From 8e886cacb19a83d0a45df87177fb8ba1c35fe7c5 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 5a571a1a..e48959f4 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -336,11 +336,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 505c015d..c1d8835c 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -344,11 +344,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 ad216828..bd9f83c1 100755 --- a/install.sh +++ b/install.sh @@ -331,11 +331,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 b48202eaa983e6ff0d028db2bd676601d9cb8139 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 e48959f4..0ec72c41 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -63,7 +63,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-server" +BUILD_SRC_DIR="build-libbitcoin-server" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -170,13 +170,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 @@ -282,7 +282,7 @@ parse_command_line_options() (--build-zmq) BUILD_ZMQ="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";; @@ -487,7 +487,7 @@ display_configuration() display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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" @@ -1120,10 +1120,10 @@ BITCOIN_SERVER_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 c1d8835c..3663d6b9 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -69,7 +69,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-server" +BUILD_SRC_DIR="build-libbitcoin-server" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -176,13 +176,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 @@ -289,7 +289,7 @@ parse_command_line_options() (--build-zmq) BUILD_ZMQ="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 @@ -530,7 +530,7 @@ display_configuration() display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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" @@ -1174,10 +1174,10 @@ BITCOIN_SERVER_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 bd9f83c1..07e6b83f 100755 --- a/install.sh +++ b/install.sh @@ -63,7 +63,7 @@ fi # The default build directory. #------------------------------------------------------------------------------ -BUILD_DIR="build-libbitcoin-server" +BUILD_SRC_DIR="build-libbitcoin-server" PRESUMED_CI_PROJECT_PATH=$(pwd) @@ -170,13 +170,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 @@ -282,7 +282,7 @@ parse_command_line_options() (--build-zmq) BUILD_ZMQ="yes";; # Unique script options. - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; esac done } @@ -432,7 +432,7 @@ display_configuration() display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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" @@ -994,10 +994,10 @@ BITCOIN_SERVER_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