Skip to content

Commit f4147d7

Browse files
pmienkpmienk
authored
Merge pull request #679 from pmienk/master
Regenerate artifacts.
2 parents 6e077ae + e9309f6 commit f4147d7

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
@@ -58,7 +58,7 @@ fi
5858

5959
# The default build directory.
6060
#------------------------------------------------------------------------------
61-
BUILD_DIR="build-libbitcoin-database"
61+
BUILD_SRC_DIR="build-libbitcoin-database"
6262

6363
PRESUMED_CI_PROJECT_PATH=$(pwd)
6464

@@ -160,13 +160,13 @@ make_jobs()
160160
shift 1
161161

162162
VERBOSITY=""
163-
if [[ DISPLAY_VERBOSE ]]; then
163+
if [[ $DISPLAY_VERBOSE ]]; then
164164
VERBOSITY="VERBOSE=1"
165165
fi
166166

167167
SEQUENTIAL=1
168168
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
169-
if [[ $JOBS > $SEQUENTIAL ]]; then
169+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
170170
make -j"$JOBS" "$@" $VERBOSITY
171171
else
172172
make "$@" $VERBOSITY
@@ -270,7 +270,7 @@ parse_command_line_options()
270270
(--build-secp256k1) BUILD_SECP256K1="yes";;
271271

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

275275
# Handle ndebug declarations due to disabled argument passthrough
276276
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -324,11 +324,6 @@ set_os_specific_compiler_settings()
324324
else # Linux
325325
STDLIB="stdc++"
326326
fi
327-
328-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
329-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
330-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
331-
fi
332327
}
333328

334329
link_to_standard_library()
@@ -479,7 +474,7 @@ display_configuration()
479474
display_message "BUILD_BOOST : $BUILD_BOOST"
480475
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
481476
display_message "BOOST_ROOT : $BOOST_ROOT"
482-
display_message "BUILD_DIR : $BUILD_DIR"
477+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
483478
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
484479
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
485480
display_message "PREFIX : $PREFIX"
@@ -1045,10 +1040,10 @@ BITCOIN_DATABASE_OPTIONS=(
10451040
display_configuration
10461041

10471042
if [[ ! ($CI == true) ]]; then
1048-
create_directory "$BUILD_DIR"
1049-
push_directory "$BUILD_DIR"
1043+
create_directory "$BUILD_SRC_DIR"
1044+
push_directory "$BUILD_SRC_DIR"
10501045
else
1051-
push_directory "$BUILD_DIR"
1046+
push_directory "$BUILD_SRC_DIR"
10521047
fi
10531048

10541049
initialize_git

‎install-cmakepresets.sh‎

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

6565
# The default build directory.
6666
#------------------------------------------------------------------------------
67-
BUILD_DIR="build-libbitcoin-database"
67+
BUILD_SRC_DIR="build-libbitcoin-database"
6868

6969
PRESUMED_CI_PROJECT_PATH=$(pwd)
7070

@@ -166,13 +166,13 @@ make_jobs()
166166
shift 1
167167

168168
VERBOSITY=""
169-
if [[ DISPLAY_VERBOSE ]]; then
169+
if [[ $DISPLAY_VERBOSE ]]; then
170170
VERBOSITY="VERBOSE=1"
171171
fi
172172

173173
SEQUENTIAL=1
174174
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
175-
if [[ $JOBS > $SEQUENTIAL ]]; then
175+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
176176
make -j"$JOBS" "$@" $VERBOSITY
177177
else
178178
make "$@" $VERBOSITY
@@ -277,7 +277,7 @@ parse_command_line_options()
277277
(--build-secp256k1) BUILD_SECP256K1="yes";;
278278

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

283283
# Handle ndebug declarations due to disabled argument passthrough
@@ -332,11 +332,6 @@ set_os_specific_compiler_settings()
332332
else # Linux
333333
STDLIB="stdc++"
334334
fi
335-
336-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
337-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
338-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
339-
fi
340335
}
341336

342337
link_to_standard_library()
@@ -514,7 +509,7 @@ display_configuration()
514509
display_message "BUILD_BOOST : $BUILD_BOOST"
515510
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
516511
display_message "BOOST_ROOT : $BOOST_ROOT"
517-
display_message "BUILD_DIR : $BUILD_DIR"
512+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
518513
display_message "PRESET_ID : $PRESET_ID"
519514
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
520515
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1087,10 +1082,10 @@ BITCOIN_DATABASE_OPTIONS=(
10871082
display_configuration
10881083

10891084
if [[ ! ($CI == true) ]]; then
1090-
create_directory "$BUILD_DIR"
1091-
push_directory "$BUILD_DIR"
1085+
create_directory "$BUILD_SRC_DIR"
1086+
push_directory "$BUILD_SRC_DIR"
10921087
else
1093-
push_directory "$BUILD_DIR"
1088+
push_directory "$BUILD_SRC_DIR"
10941089
fi
10951090

10961091
initialize_git

‎install.sh‎

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

5959
# The default build directory.
6060
#------------------------------------------------------------------------------
61-
BUILD_DIR="build-libbitcoin-database"
61+
BUILD_SRC_DIR="build-libbitcoin-database"
6262

6363
PRESUMED_CI_PROJECT_PATH=$(pwd)
6464

@@ -160,13 +160,13 @@ make_jobs()
160160
shift 1
161161

162162
VERBOSITY=""
163-
if [[ DISPLAY_VERBOSE ]]; then
163+
if [[ $DISPLAY_VERBOSE ]]; then
164164
VERBOSITY="VERBOSE=1"
165165
fi
166166

167167
SEQUENTIAL=1
168168
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
169-
if [[ $JOBS > $SEQUENTIAL ]]; then
169+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
170170
make -j"$JOBS" "$@" $VERBOSITY
171171
else
172172
make "$@" $VERBOSITY
@@ -270,7 +270,7 @@ parse_command_line_options()
270270
(--build-secp256k1) BUILD_SECP256K1="yes";;
271271

272272
# Unique script options.
273-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
273+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
274274
esac
275275
done
276276
}
@@ -319,11 +319,6 @@ set_os_specific_compiler_settings()
319319
else # Linux
320320
STDLIB="stdc++"
321321
fi
322-
323-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
324-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
325-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
326-
fi
327322
}
328323

329324
link_to_standard_library()
@@ -424,7 +419,7 @@ display_configuration()
424419
display_message "BUILD_BOOST : $BUILD_BOOST"
425420
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
426421
display_message "BOOST_ROOT : $BOOST_ROOT"
427-
display_message "BUILD_DIR : $BUILD_DIR"
422+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
428423
display_message "PREFIX : $PREFIX"
429424
display_message "DISABLE_SHARED : $DISABLE_SHARED"
430425
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -919,10 +914,10 @@ BITCOIN_DATABASE_OPTIONS=(
919914
display_configuration
920915

921916
if [[ ! ($CI == true) ]]; then
922-
create_directory "$BUILD_DIR"
923-
push_directory "$BUILD_DIR"
917+
create_directory "$BUILD_SRC_DIR"
918+
push_directory "$BUILD_SRC_DIR"
924919
else
925-
push_directory "$BUILD_DIR"
920+
push_directory "$BUILD_SRC_DIR"
926921
fi
927922

928923
initialize_git

0 commit comments

Comments
 (0)