Skip to content

Commit 43c49c6

Browse files
pmienkpmienk
authored
Merge pull request #858 from pmienk/master
Regenerate artifacts.
2 parents 213d168 + fe59fc7 commit 43c49c6

File tree

3 files changed

+24
-39
lines changed

3 files changed

+24
-39
lines changed

‎install-cmake.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fi
6060

6161
# The default build directory.
6262
#------------------------------------------------------------------------------
63-
BUILD_DIR="build-libbitcoin-node"
63+
BUILD_SRC_DIR="build-libbitcoin-node"
6464

6565
PRESUMED_CI_PROJECT_PATH=$(pwd)
6666

@@ -162,13 +162,13 @@ make_jobs()
162162
shift 1
163163

164164
VERBOSITY=""
165-
if [[ DISPLAY_VERBOSE ]]; then
165+
if [[ $DISPLAY_VERBOSE ]]; then
166166
VERBOSITY="VERBOSE=1"
167167
fi
168168

169169
SEQUENTIAL=1
170170
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
171-
if [[ $JOBS > $SEQUENTIAL ]]; then
171+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
172172
make -j"$JOBS" "$@" $VERBOSITY
173173
else
174174
make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
272272
(--build-secp256k1) BUILD_SECP256K1="yes";;
273273

274274
# Unique script options.
275-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
275+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
276276

277277
# Handle ndebug declarations due to disabled argument passthrough
278278
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -326,11 +326,6 @@ set_os_specific_compiler_settings()
326326
else # Linux
327327
STDLIB="stdc++"
328328
fi
329-
330-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
331-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
332-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
333-
fi
334329
}
335330

336331
link_to_standard_library()
@@ -481,7 +476,7 @@ display_configuration()
481476
display_message "BUILD_BOOST : $BUILD_BOOST"
482477
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
483478
display_message "BOOST_ROOT : $BOOST_ROOT"
484-
display_message "BUILD_DIR : $BUILD_DIR"
479+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
485480
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
486481
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
487482
display_message "PREFIX : $PREFIX"
@@ -1073,10 +1068,10 @@ BITCOIN_NODE_OPTIONS=(
10731068
display_configuration
10741069

10751070
if [[ ! ($CI == true) ]]; then
1076-
create_directory "$BUILD_DIR"
1077-
push_directory "$BUILD_DIR"
1071+
create_directory "$BUILD_SRC_DIR"
1072+
push_directory "$BUILD_SRC_DIR"
10781073
else
1079-
push_directory "$BUILD_DIR"
1074+
push_directory "$BUILD_SRC_DIR"
10801075
fi
10811076

10821077
initialize_git

‎install-cmakepresets.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fi
6666

6767
# The default build directory.
6868
#------------------------------------------------------------------------------
69-
BUILD_DIR="build-libbitcoin-node"
69+
BUILD_SRC_DIR="build-libbitcoin-node"
7070

7171
PRESUMED_CI_PROJECT_PATH=$(pwd)
7272

@@ -168,13 +168,13 @@ make_jobs()
168168
shift 1
169169

170170
VERBOSITY=""
171-
if [[ DISPLAY_VERBOSE ]]; then
171+
if [[ $DISPLAY_VERBOSE ]]; then
172172
VERBOSITY="VERBOSE=1"
173173
fi
174174

175175
SEQUENTIAL=1
176176
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
177-
if [[ $JOBS > $SEQUENTIAL ]]; then
177+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
178178
make -j"$JOBS" "$@" $VERBOSITY
179179
else
180180
make "$@" $VERBOSITY
@@ -279,7 +279,7 @@ parse_command_line_options()
279279
(--build-secp256k1) BUILD_SECP256K1="yes";;
280280

281281
# Unique script options.
282-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
282+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
283283
(--preset=*) PRESET_ID="${OPTION#*=}";;
284284

285285
# Handle ndebug declarations due to disabled argument passthrough
@@ -334,11 +334,6 @@ set_os_specific_compiler_settings()
334334
else # Linux
335335
STDLIB="stdc++"
336336
fi
337-
338-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
339-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
340-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
341-
fi
342337
}
343338

344339
link_to_standard_library()
@@ -520,7 +515,7 @@ display_configuration()
520515
display_message "BUILD_BOOST : $BUILD_BOOST"
521516
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
522517
display_message "BOOST_ROOT : $BOOST_ROOT"
523-
display_message "BUILD_DIR : $BUILD_DIR"
518+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
524519
display_message "PRESET_ID : $PRESET_ID"
525520
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
526521
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1121,10 +1116,10 @@ BITCOIN_NODE_OPTIONS=(
11211116
display_configuration
11221117

11231118
if [[ ! ($CI == true) ]]; then
1124-
create_directory "$BUILD_DIR"
1125-
push_directory "$BUILD_DIR"
1119+
create_directory "$BUILD_SRC_DIR"
1120+
push_directory "$BUILD_SRC_DIR"
11261121
else
1127-
push_directory "$BUILD_DIR"
1122+
push_directory "$BUILD_SRC_DIR"
11281123
fi
11291124

11301125
initialize_git

‎install.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fi
6060

6161
# The default build directory.
6262
#------------------------------------------------------------------------------
63-
BUILD_DIR="build-libbitcoin-node"
63+
BUILD_SRC_DIR="build-libbitcoin-node"
6464

6565
PRESUMED_CI_PROJECT_PATH=$(pwd)
6666

@@ -162,13 +162,13 @@ make_jobs()
162162
shift 1
163163

164164
VERBOSITY=""
165-
if [[ DISPLAY_VERBOSE ]]; then
165+
if [[ $DISPLAY_VERBOSE ]]; then
166166
VERBOSITY="VERBOSE=1"
167167
fi
168168

169169
SEQUENTIAL=1
170170
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
171-
if [[ $JOBS > $SEQUENTIAL ]]; then
171+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
172172
make -j"$JOBS" "$@" $VERBOSITY
173173
else
174174
make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
272272
(--build-secp256k1) BUILD_SECP256K1="yes";;
273273

274274
# Unique script options.
275-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
275+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
276276
esac
277277
done
278278
}
@@ -321,11 +321,6 @@ set_os_specific_compiler_settings()
321321
else # Linux
322322
STDLIB="stdc++"
323323
fi
324-
325-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
326-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
327-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
328-
fi
329324
}
330325

331326
link_to_standard_library()
@@ -426,7 +421,7 @@ display_configuration()
426421
display_message "BUILD_BOOST : $BUILD_BOOST"
427422
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
428423
display_message "BOOST_ROOT : $BOOST_ROOT"
429-
display_message "BUILD_DIR : $BUILD_DIR"
424+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
430425
display_message "PREFIX : $PREFIX"
431426
display_message "DISABLE_SHARED : $DISABLE_SHARED"
432427
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -947,10 +942,10 @@ BITCOIN_NODE_OPTIONS=(
947942
display_configuration
948943

949944
if [[ ! ($CI == true) ]]; then
950-
create_directory "$BUILD_DIR"
951-
push_directory "$BUILD_DIR"
945+
create_directory "$BUILD_SRC_DIR"
946+
push_directory "$BUILD_SRC_DIR"
952947
else
953-
push_directory "$BUILD_DIR"
948+
push_directory "$BUILD_SRC_DIR"
954949
fi
955950

956951
initialize_git

0 commit comments

Comments
 (0)