Skip to content

Commit ebe8f95

Browse files
Explicitly quote the ICU_LIB shell expansion (resolves #1130).
Update clang compiler version to 5.0.
1 parent a779da3 commit ebe8f95

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ matrix:
3535
sources:
3636
- sourceline: 'ppa:h-rayflood/llvm'
3737
packages:
38-
- clang-3.8
38+
- clang-5.0
3939
- os: linux
4040
compiler: gcc
4141
env: LINK=dynamic
@@ -66,7 +66,7 @@ install:
6666

6767
# Export CC/CXX to control compiler/version.
6868
- if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
69-
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.8; export CXX=clang++-3.8; fi
69+
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
7070
- if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
7171
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
7272
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi

builds/cmake/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" )
113113

114114
# Find zmq
115115
#------------------------------------------------------------------------------
116-
find_package( Zmq 4.2.5 REQUIRED )
116+
find_package( Zmq 4.3.2 REQUIRED )
117117

118118
# Find mbedtls
119119
#------------------------------------------------------------------------------

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ AS_CASE([${with_tests}], [yes],
161161
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])],
162162
[AC_SUBST([boost_unit_test_framework_LIBS], [])])
163163

164-
# Require zmq of at least version 4.2.5 and output ${zmq_CPPFLAGS/LIBS/PKG}.
164+
# Require zmq of at least version 4.3.2 and output ${zmq_CPPFLAGS/LIBS/PKG}.
165165
#------------------------------------------------------------------------------
166-
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.5],
167-
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.5" 2>/dev/null`"
168-
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.5" 2>/dev/null`"],
166+
PKG_CHECK_MODULES([zmq], [libzmq >= 4.3.2],
167+
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.2" 2>/dev/null`"
168+
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.2" 2>/dev/null`"],
169169
[zmq_INCLUDEDIR=""
170170
zmq_OTHER_CFLAGS=""])
171-
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.5'])
171+
AC_SUBST([zmq_PKG], ['libzmq >= 4.3.2'])
172172
AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}])
173173
AS_IF([test x${zmq_INCLUDEDIR} != "x"],
174174
[AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])],

install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ BUILD_DIR="build-libbitcoin-protocol"
3737

3838
# ZMQ archive.
3939
#------------------------------------------------------------------------------
40-
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz"
41-
ZMQ_ARCHIVE="zeromq-4.2.5.tar.gz"
40+
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz"
41+
ZMQ_ARCHIVE="zeromq-4.3.2.tar.gz"
4242

4343
# MBEDTLS archive.
4444
#------------------------------------------------------------------------------
@@ -546,7 +546,7 @@ initialize_boost_icu_configuration()
546546
BOOST_ICU_POSIX="off"
547547

548548
# Extract ICU libs from package config variables and augment with -ldl.
549-
ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" )
549+
ICU_LIBS="`pkg-config icu-i18n --libs` -ldl"
550550

551551
# This is a hack for boost m4 scripts that fail with ICU dependency.
552552
# See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.

libbitcoin-protocol.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
2525
#==============================================================================
2626
# Dependencies that publish package configuration.
2727
#------------------------------------------------------------------------------
28-
Requires: libzmq >= 4.2.5 libbitcoin-system >= 4.0.0
28+
Requires: libzmq >= 4.3.2 libbitcoin-system >= 4.0.0
2929

3030
# Include directory and any other required compiler flags.
3131
#------------------------------------------------------------------------------

0 commit comments

Comments
 (0)