From 8fe124482565fdd54628dd0d40eb28c415803633 Mon Sep 17 00:00:00 2001 From: Neill Miller Date: Fri, 30 Aug 2019 10:39:31 -0400 Subject: [PATCH] Explicitly quote the ICU_LIB shell expansion (resolves #1130). Update clang compiler version to 5.0. --- .travis.yml | 4 ++-- install.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57d1aa4e..53212fec 100755 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: sources: - sourceline: 'ppa:h-rayflood/llvm' packages: - - clang-3.8 + - clang-5.0 - os: linux compiler: gcc env: LINK=dynamic @@ -71,7 +71,7 @@ install: # Export CC/CXX to control compiler/version. - if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi - - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.8; export CXX=clang++-3.8; fi + - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi - if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi - if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi diff --git a/install.sh b/install.sh index f89fcfc5..bc733dad 100755 --- a/install.sh +++ b/install.sh @@ -34,8 +34,8 @@ BUILD_DIR="build-libbitcoin-server" # ZMQ archive. #------------------------------------------------------------------------------ -ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz" -ZMQ_ARCHIVE="zeromq-4.2.5.tar.gz" +ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz" +ZMQ_ARCHIVE="zeromq-4.3.2.tar.gz" # Boost archive. #------------------------------------------------------------------------------ @@ -579,7 +579,7 @@ initialize_boost_icu_configuration() BOOST_ICU_POSIX="off" # Extract ICU libs from package config variables and augment with -ldl. - ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" ) + ICU_LIBS="`pkg-config icu-i18n --libs` -ldl" # This is a hack for boost m4 scripts that fail with ICU dependency. # See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.