File tree Expand file tree Collapse file tree 5 files changed +7
-7
lines changed
include/bitcoin/consensus Expand file tree Collapse file tree 5 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 44# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55#
66# ##############################################################################
7- version : 3.4 .0.{build}-{branch}
7+ version : 3.6 .0.{build}-{branch}
88
99image : Visual Studio 2013
1010
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ matrix:
3535 sources :
3636 - sourceline : ' ppa:h-rayflood/llvm'
3737 packages :
38- - clang-3.4
38+ - clang-5.0
3939 - swig
4040 - os : linux
4141 compiler : gcc
@@ -72,7 +72,7 @@ install:
7272
7373 # Export CC/CXX to control compiler/version.
7474 - if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
75- - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.4 ; export CXX=clang++-3.4 ; fi
75+ - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0 ; export CXX=clang++-5.0 ; fi
7676 - if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
7777 - if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
7878 - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
Original file line number Diff line number Diff line change 1313AC_PREREQ ( [ 2.65] )
1414
1515# Process command-line arguments and perform initialization and verification.
16- AC_INIT ( [ libbitcoin-consensus] ,
[ 3.4 .0] ,
[ [email protected] ] ) 16+ AC_INIT ( [ libbitcoin-consensus] ,
[ 3.6 .0] ,
[ [email protected] ] ) 1717
1818# Do compilation tests.
1919AC_LANG ( C++ )
Original file line number Diff line number Diff line change 1212 * For interpretation of the versioning scheme see: http://semver.org
1313 */
1414
15- #define LIBBITCOIN_CONSENSUS_VERSION " 3.4 .0"
15+ #define LIBBITCOIN_CONSENSUS_VERSION " 3.6 .0"
1616#define LIBBITCOIN_CONSENSUS_MAJOR_VERSION 3
17- #define LIBBITCOIN_CONSENSUS_MINOR_VERSION 4
17+ #define LIBBITCOIN_CONSENSUS_MINOR_VERSION 6
1818#define LIBBITCOIN_CONSENSUS_PATCH_VERSION 0
1919
2020#endif
Original file line number Diff line number Diff line change @@ -508,7 +508,7 @@ initialize_boost_icu_configuration()
508508 BOOST_ICU_POSIX=" off"
509509
510510 # Extract ICU libs from package config variables and augment with -ldl.
511- ICU_LIBS=( ` pkg-config icu-i18n --libs` " -ldl" )
511+ ICU_LIBS=" ` pkg-config icu-i18n --libs` -ldl"
512512
513513 # This is a hack for boost m4 scripts that fail with ICU dependency.
514514 # See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.
You can’t perform that action at this time.
0 commit comments