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

Bump libuv to v1.24.0 and cpp-driver to 2.10.0

parent b78c2307
......@@ -6,8 +6,8 @@ CASSANDRA_VERSION = 2.2.10
MOSQUITTO_VERSION = 1.4.14
BOOST_VERSION = 1.58.0
OPENSSL_VERSION = 1.0.2l
CPPDRV_VERSION = 2.0.1
LIBUV_VERSION = 0.10.36
CPPDRV_VERSION = 2.10.0
LIBUV_VERSION = 1.24.0
SOURCEFORGE_MROR = netcologne
CPPNET_VERSION = 0.12.0-final
......@@ -20,7 +20,7 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
cpp-driver-$(CPPDRV_VERSION).tar.gz;https://github.com/datastax/cpp-driver/archive/$(CPPDRV_VERSION).tar.gz \
cpp-netlib-$(CPPNET_VERSION).tar.gz;http://downloads.cpp-netlib.org/0.12.0/cpp-netlib-$(CPPNET_VERSION).tar.gz
DISTFILES_HASHES = apache-cassandra-2.2.10.tar.gz|4c58cb7c6753ce26f7c4d650502feece;mosquitto-1.4.14.tar.gz|6b0966e93f118bc71ad7b61600a6c2d3;boost_1_58_0.tar.gz|5a5d5614d9a07672e1ab2a250b5defc5;openssl-1.0.2l.tar.gz|f85123cd390e864dfbe517e7616e6566;cpp-driver-2.0.1.tar.gz|70bf83e1cbd0d35b7e5ed66fc4dccbb1;libuv-v0.10.36.tar.gz|8eb77b4fee4f311c114a9fee06f5a2ab;cpp-netlib-0.12.0-final.tar.gz|29b87c0e8c1a9e7fbdea5afcec947d53
DISTFILES_HASHES = apache-cassandra-2.2.10.tar.gz|4c58cb7c6753ce26f7c4d650502feece;mosquitto-1.4.14.tar.gz|6b0966e93f118bc71ad7b61600a6c2d3;boost_1_58_0.tar.gz|5a5d5614d9a07672e1ab2a250b5defc5;openssl-1.0.2l.tar.gz|f85123cd390e864dfbe517e7616e6566;cpp-driver-2.10.0.tar.gz|6d15dd2cccd2efd1fdc86089d26971d0;libuv-v1.24.0.tar.gz|90320330757253b07404d2a97f59c66b;cpp-netlib-0.12.0-final.tar.gz|29b87c0e8c1a9e7fbdea5afcec947d53
include common.mk
......@@ -83,7 +83,7 @@ clean:
cleanall: clean
@$(foreach f,$(DISTFILESPATHS),echo "Cleaning $(f)..." && rm -rf $(DCDBDEPSPATH)/$(f) && echo;)
@$(foreach f,mosquitto cpp-driver cpp-netlib,echo "Cleaning $(f)..." && rm -rf $(DCDBDEPSPATH)/$(f)_build && echo;)
@$(foreach f,mosquitto cpp-netlib,echo "Cleaning $(f)..." && rm -rf $(DCDBDEPSPATH)/$(f)_build && echo;)
distclean: clean
@echo "Wiping dependencies..."
......@@ -159,24 +159,22 @@ $(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.installed: $(DCDBDEPSPATH)/boost_$(BOO
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.patched
@echo "Building libuv..."
cd $(@D) && env CC="$(CC)" CFLAGS="$(CFLAGS)" make -j $(MAKETHREADS) && touch $(@)
mkdir -p $(@D)/build
cd $(@D)/build && \
CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
.. && \
make -j $(MAKETHREADS) && touch $(@)
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.installed: $(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing libuv..."
mkdir -p $(DCDBDEPLOYPATH)/include/uv-private
cd $(@D) && install -c include/uv.h $(DCDBDEPLOYPATH)/include/
cd $(@D) && install -c include/uv-private/* $(DCDBDEPLOYPATH)/include/uv-private/
if [ -e $(@D)/libuv.a ]; then cd $(@D) && install -c libuv.a $(DCDBDEPLOYPATH)/lib/; fi
if [ -e $(@D)/libuv.so ]; then cd $(@D) && install -c libuv.so $(DCDBDEPLOYPATH)/lib/; \
if [ ! -e $(DCDBDEPLOYPATH)/lib/libuv.so.0.10 ]; then ln -s $(DCDBDEPLOYPATH)/lib/libuv.so $(DCDBDEPLOYPATH)/lib/libuv.so.0.10; fi; \
fi
if [ -e $(@D)/libuv.dylib ]; then cd $(@D) && install -c libuv.dylib $(DCDBDEPLOYPATH)/lib/; fi
touch $(@)
cd $(@D)/build && 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
@echo "Building cpp-driver..."
mkdir -p $(DCDBDEPSPATH)/cpp-driver_build
cd $(DCDBDEPSPATH)/cpp-driver_build && \
mkdir -p $(@D)/build
cd $(@D)/build && \
CC=$(FULL_CC) CXX=$(FULL_CXX) cmake $(CMAKE_CROSS_FLAGS) \
-DOPENSSL_ROOT_DIR=$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION) \
-DLIBUV_ROOT_DIR=$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION) \
......@@ -185,12 +183,12 @@ $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
-DCMAKE_EXE_LINKER_FLAGS="-L$(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/stage/lib -lboost_random" \
-DCMAKE_SHARED_LINKER_FLAGS="-L$(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/stage/lib -lboost_random" \
$(@D) && \
.. && \
make -j $(MAKETHREADS) && touch $(@)
$(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.installed: $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing cpp-driver..."
cd $(DCDBDEPSPATH)/cpp-driver_build && make install && touch $(@)
cd $(@D)/build && make install && touch $(@)
$(DCDBDEPSPATH)/cpp-netlib-$(CPPNET_VERSION)/.built: $(DCDBDEPSPATH)/cpp-netlib-$(CPPNET_VERSION)/.patched
@echo "Building cpp-netlib..."
......
diff -ur cpp-driver-2.10.0-orig/cmake/modules/FindLibuv.cmake cpp-driver-2.10.0/cmake/modules/FindLibuv.cmake
--- cpp-driver-2.10.0-orig/cmake/modules/FindLibuv.cmake 2018-10-10 14:48:43.000000000 +0200
+++ cpp-driver-2.10.0/cmake/modules/FindLibuv.cmake 2018-12-09 21:36:55.000000000 +0100
@@ -53,7 +53,7 @@
find_library(LIBUV_LIBRARY
NAMES ${_LIBUV_NAMES}
${_LIBUV_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES lib
+ PATH_SUFFIXES lib build
NO_DEFAULT_PATH)
# Extract version number if possible.
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