Skip to content

Commit 27c87df

Browse files
committed
Update boost to 1.55.0 for gcc (bugs in 1.50-1.54).
1 parent e415a47 commit 27c87df

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_TEST_DYN_LINK]))
105105

106106
# Check dependencies.
107107
#==============================================================================
108-
# Require Boost of at least version 1.50.0 if in gcc and output ${boost_CPPFLAGS/LDFLAGS}.
108+
# Require Boost of at least version 1.55.0 if in gcc and output ${boost_CPPFLAGS/LDFLAGS}.
109109
#------------------------------------------------------------------------------
110110
AS_CASE([${CC}], [*gcc*],
111-
[AX_BOOST_BASE([1.50.0],
111+
[AX_BOOST_BASE([1.55.0],
112112
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
113113
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
114114
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
115115
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
116-
[AC_MSG_ERROR([Boost 1.50.0 or later is required but was not found.])])])
116+
[AC_MSG_ERROR([Boost 1.55.0 or later is required but was not found.])])])
117117

118118
# Require Boost of at least version 1.54.0 if in clang and output ${boost_CPPFLAGS/LDFLAGS}.
119119
#------------------------------------------------------------------------------

install.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ BUILD_DIR="build-libbitcoin-server"
3232

3333
# Boost archive for gcc.
3434
#------------------------------------------------------------------------------
35-
BOOST_URL_GCC="http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
36-
BOOST_ARCHIVE_GCC="boost_1_50_0.tar.bz2"
35+
BOOST_URL_GCC="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download"
36+
BOOST_ARCHIVE_GCC="boost_1_55_0.tar.bz2"
3737
BOOST_STANDARD_GCC=\
3838
"threading=multi "\
3939
"variant=release "\
@@ -270,14 +270,16 @@ circumvent_boost_icu_detection()
270270
# Boost ICU discovery fails when using prefix, can't fix with -sICU_LINK,
271271
# so we rewrite the two 'has_icu_test.cpp' files to always return success.
272272

273-
local SUCCESS="int main() { return 0; }"
274-
local REGEX_TEST="libs/regex/build/has_icu_test.cpp"
275-
local LOCALE_TEST="libs/locale/build/has_icu_test.cpp"
276-
277-
echo $SUCCESS > $REGEX_TEST
278-
echo $SUCCESS > $LOCALE_TEST
279-
280-
echo "hack: ICU detection modified, will always indicate found."
273+
if [[ $BUILD_ICU ]]; then
274+
local SUCCESS="int main() { return 0; }"
275+
local REGEX_TEST="libs/regex/build/has_icu_test.cpp"
276+
local LOCALE_TEST="libs/locale/build/has_icu_test.cpp"
277+
278+
echo $SUCCESS > $REGEX_TEST
279+
echo $SUCCESS > $LOCALE_TEST
280+
281+
echo "hack: ICU detection modified, will always indicate found."
282+
fi
281283
}
282284

283285
configure_options()

0 commit comments

Comments
 (0)