Skip to content

Commit e358e42

Browse files
Merge pull request #273 from thecodefactory/build-update
Regenerate build artifacts.
2 parents fa35f49 + dc83e44 commit e358e42

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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

99
image: Visual Studio 2013
1010

.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.4
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.4; export CXX=clang++-3.4; 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

configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
AC_PREREQ([2.65])
1414

1515
# Process command-line arguments and perform initialization and verification.
16-
AC_INIT([libbitcoin-database], [3.4.0], [eric@voskuil.org])
16+
AC_INIT([libbitcoin-database], [3.6.0], [eric@voskuil.org])
1717

1818
# Do compilation tests.
1919
AC_LANG(C++)
@@ -157,14 +157,14 @@ AS_CASE([${with_tests}], [yes],
157157
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])],
158158
[AC_SUBST([boost_unit_test_framework_LIBS], [])])
159159

160-
# Require bitcoin of at least version 3.4.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
160+
# Require bitcoin of at least version 3.6.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
161161
#------------------------------------------------------------------------------
162-
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.4.0],
163-
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.4.0" 2>/dev/null`"
164-
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.4.0" 2>/dev/null`"],
162+
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.6.0],
163+
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.6.0" 2>/dev/null`"
164+
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.6.0" 2>/dev/null`"],
165165
[bitcoin_INCLUDEDIR=""
166166
bitcoin_OTHER_CFLAGS=""])
167-
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.4.0'])
167+
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.6.0'])
168168
AC_SUBST([bitcoin_CPPFLAGS], [${bitcoin_CFLAGS}])
169169
AS_IF([test x${bitcoin_INCLUDEDIR} != "x"],
170170
[AC_SUBST([bitcoin_ISYS_CPPFLAGS], ["-isystem${bitcoin_INCLUDEDIR} ${bitcoin_OTHER_CFLAGS}"])],

include/bitcoin/database/version.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* For interpretation of the versioning scheme see: http://semver.org
1313
*/
1414

15-
#define LIBBITCOIN_DATABASE_VERSION "3.4.0"
15+
#define LIBBITCOIN_DATABASE_VERSION "3.6.0"
1616
#define LIBBITCOIN_DATABASE_MAJOR_VERSION 3
17-
#define LIBBITCOIN_DATABASE_MINOR_VERSION 4
17+
#define LIBBITCOIN_DATABASE_MINOR_VERSION 6
1818
#define LIBBITCOIN_DATABASE_PATCH_VERSION 0
1919

2020
#endif

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ initialize_boost_icu_configuration()
526526
BOOST_ICU_POSIX="off"
527527

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

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

libbitcoin-database.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: libbitcoin >= 3.4.0
28+
Requires: libbitcoin >= 3.6.0
2929

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

0 commit comments

Comments
 (0)