Commit dfa45b57 authored by Michael Ott's avatar Michael Ott
Browse files

Bump cpp-driver to v2.15.2 and libuv to 1.38.1, switch to CQL protocol v4

parent ec42b6ae
...@@ -2,8 +2,8 @@ CASSANDRA_VERSION = 3.11.5 ...@@ -2,8 +2,8 @@ CASSANDRA_VERSION = 3.11.5
MOSQUITTO_VERSION = 1.5.5 MOSQUITTO_VERSION = 1.5.5
BOOST_VERSION = 1.70.0 BOOST_VERSION = 1.70.0
OPENSSL_VERSION = 1.1.1c OPENSSL_VERSION = 1.1.1c
CPPDRV_VERSION = 2.10.0 CPPDRV_VERSION = 2.15.2
LIBUV_VERSION = 1.24.0 LIBUV_VERSION = 1.38.1
BACNET-STACK_VERSION = 0.8.6 BACNET-STACK_VERSION = 0.8.6
FREEIPMI_VERSION = 1.6.3 FREEIPMI_VERSION = 1.6.3
GCRYPT_VERSION = 1.8.4 GCRYPT_VERSION = 1.8.4
...@@ -36,8 +36,8 @@ DISTFILES_HASHES = apache-cassandra-3.11.5.tar.gz|9428d8cd8bf8880d6536142e4b8374 ...@@ -36,8 +36,8 @@ DISTFILES_HASHES = apache-cassandra-3.11.5.tar.gz|9428d8cd8bf8880d6536142e4b8374
mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9;\ mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9;\
boost_1_70_0.tar.gz|fea771fe8176828fabf9c09242ee8c26;\ boost_1_70_0.tar.gz|fea771fe8176828fabf9c09242ee8c26;\
openssl-1.1.1c.tar.gz|15e21da6efe8aa0e0768ffd8cd37a5f6;\ openssl-1.1.1c.tar.gz|15e21da6efe8aa0e0768ffd8cd37a5f6;\
cpp-driver-2.10.0.tar.gz|6d15dd2cccd2efd1fdc86089d26971d0;\ cpp-driver-2.15.2.tar.gz|c33f14436c79fc740879c02917fb9022;\
libuv-v1.24.0.tar.gz|90320330757253b07404d2a97f59c66b;\ libuv-v1.38.1.tar.gz|44e400ca3974a046b977f41e18c44142;\
bacnet-stack-0.8.6.tgz|544ebd42ed959deb2213209b66bbc460;\ bacnet-stack-0.8.6.tgz|544ebd42ed959deb2213209b66bbc460;\
libgcrypt-1.8.4.tar.gz|433ab0a47b25994fa92b165db185f174;\ libgcrypt-1.8.4.tar.gz|433ab0a47b25994fa92b165db185f174;\
libgpg-error-1.36.tar.gz|f2283e22959ef71f44d8be3d0987a96b;\ libgpg-error-1.36.tar.gz|f2283e22959ef71f44d8be3d0987a96b;\
...@@ -188,8 +188,8 @@ $(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.installed: $(DCDBDEPSPATH)/boost_$(BOO ...@@ -188,8 +188,8 @@ $(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.installed: $(DCDBDEPSPATH)/boost_$(BOO
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.patched $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.patched
@echo "Building libuv..." @echo "Building libuv..."
mkdir -p $(@D)/build mkdir -p $(@D)/lib
cd $(@D)/build && \ cd $(@D)/lib && \
CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \ CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \ -DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
...@@ -198,7 +198,7 @@ $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built: $(DCDBDEPSPATH)/libuv-v$(LIBUV_V ...@@ -198,7 +198,7 @@ $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built: $(DCDBDEPSPATH)/libuv-v$(LIBUV_V
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.installed: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built | $(DCDBDEPLOYPATH) $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.installed: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing libuv..." @echo "Installing libuv..."
cd $(@D)/build && make install && touch $(@) cd $(@D)/lib && make install && touch $(@)
$(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.patched $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.patched $(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built
@echo "Building cpp-driver..." @echo "Building cpp-driver..."
......
...@@ -374,8 +374,8 @@ bool ConnectionImpl::connect() { ...@@ -374,8 +374,8 @@ bool ConnectionImpl::connect() {
cass_cluster_set_core_connections_per_host(cluster, coreConnPerHost); cass_cluster_set_core_connections_per_host(cluster, coreConnPerHost);
cass_cluster_set_request_timeout(cluster, 60000); cass_cluster_set_request_timeout(cluster, 60000);
/* Force protcol version to 1 */ /* Force protcol version to 4 */
cass_cluster_set_protocol_version(cluster, 1); cass_cluster_set_protocol_version(cluster, 4);
/* Connect to the server */ /* Connect to the server */
CassError rc = CASS_OK; CassError rc = CASS_OK;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment