2424# --prefix=<absolute-path> Library install location (defaults to /usr/local).
2525# --disable-shared Disables shared library builds.
2626# --disable-static Disables static library builds.
27+ # --verbose Display verbose output (defaults to quiet on called tooling).
2728# --help Display usage, overriding script execution.
2829#
2930# Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
@@ -47,17 +48,13 @@ SEQUENTIAL=1
4748if [[ $GIT_CLONE_PARAMS ]]; then
4849 display_message " Using shell-defined GIT_CLONE_PARAMS value."
4950else
50- GIT_CLONE_PARAMS=" "
51+ GIT_CLONE_PARAMS=" --depth 1 --single-branch "
5152fi
5253
5354# The default build directory.
5455# ------------------------------------------------------------------------------
5556BUILD_DIR=" build-libbitcoin-server"
5657
57- # Git clone parameters.
58- # ------------------------------------------------------------------------------
59- GIT_CLONE_PARAMS=" --depth 1 --single-branch"
60-
6158PRESUMED_CI_PROJECT_PATH=$( pwd)
6259
6360# ICU archive.
@@ -162,12 +159,17 @@ make_jobs()
162159 local JOBS=$1
163160 shift 1
164161
162+ VERBOSITY=" "
163+ if [[ DISPLAY_VERBOSE ]]; then
164+ VERBOSITY=" VERBOSE=1"
165+ fi
166+
165167 SEQUENTIAL=1
166168 # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
167169 if [[ $JOBS > $SEQUENTIAL ]]; then
168- make -j" $JOBS " " $@ "
170+ make -j" $JOBS " " $@ " $VERBOSITY
169171 else
170- make " $@ "
172+ make " $@ " $VERBOSITY
171173 fi
172174}
173175
@@ -252,6 +254,7 @@ parse_command_line_options()
252254 case $OPTION in
253255 # Standard script options.
254256 (--help) DISPLAY_HELP=" yes" ;;
257+ (--verbose) DISPLAY_VERBOSE=" yes" ;;
255258
256259 # Standard build options.
257260 (--prefix=* ) PREFIX=" ${OPTION#* =} " ;;
@@ -325,7 +328,7 @@ set_os_specific_compiler_settings()
325328
326329link_to_standard_library ()
327330{
328- if [[ ($OS == Linux && $CC == " clang" ) || ($OS == OpenBSD) ]]; then
331+ if [[ ($OS == Linux && $CC == clang* ) || ($OS == OpenBSD) ]]; then
329332 export LDLIBS=" -l$STDLIB $LDLIBS "
330333 export CXXFLAGS=" -stdlib=lib$STDLIB $CXXFLAGS "
331334 fi
@@ -518,9 +521,18 @@ extract_from_tarball()
518521 push_directory " $TARGET_DIR "
519522
520523 # Extract the source locally.
521- wget --output-document " $ARCHIVE " " $URL "
522- tar --extract --file " $ARCHIVE " " --$COMPRESSION " --strip-components=1
524+ WGET=" wget --quiet"
525+ TAR=" tar"
526+
527+ if [[ $DISPLAY_VERBOSE ]]; then
528+ WGET=" wget --verbose"
529+ TAR=" tar --verbose"
530+ fi
531+
532+ $WGET --output-document " $ARCHIVE " " $URL "
533+ $TAR --extract --file " $ARCHIVE " " --$COMPRESSION " --strip-components=1
523534
535+ display_message " Completed download and extraction successfully."
524536 pop_directory
525537}
526538
@@ -760,7 +772,7 @@ initialize_boost_configuration()
760772 BOOST_TOOLSET=" toolset=$CC "
761773 fi
762774
763- if [[ ($OS == Linux && $CC == " clang" ) || ($OS == OpenBSD) ]]; then
775+ if [[ ($OS == Linux && $CC == clang* ) || ($OS == OpenBSD) ]]; then
764776 STDLIB_FLAG=" -stdlib=lib$STDLIB "
765777 BOOST_CXXFLAGS=" cxxflags=$STDLIB_FLAG "
766778 BOOST_LINKFLAGS=" linkflags=$STDLIB_FLAG "
0 commit comments