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

Bump Boost to 1.58 and cpp-netlib to 0.12. Fix cpp-netlib install.

parent 58369fd3
...@@ -6,7 +6,7 @@ PROJECTS = FilePusher SysFsPusher CollectAgent ParastationProvider IPMIPusher Mo ...@@ -6,7 +6,7 @@ PROJECTS = FilePusher SysFsPusher CollectAgent ParastationProvider IPMIPusher Mo
CASSANDRA_VERSION = 2.2.6 CASSANDRA_VERSION = 2.2.6
MOSQUITTO_VERSION = 1.3.5 MOSQUITTO_VERSION = 1.3.5
BOOST_VERSION = 1.57.0 BOOST_VERSION = 1.58.0
SNMP_VERSION = 5.7.3 SNMP_VERSION = 5.7.3
OPENSSL_VERSION = 1.0.1t OPENSSL_VERSION = 1.0.1t
CPPDRV_VERSION = 2.0.1 CPPDRV_VERSION = 2.0.1
...@@ -15,7 +15,7 @@ HTTPD_VERSION = 2.4.23 ...@@ -15,7 +15,7 @@ HTTPD_VERSION = 2.4.23
APR_VERSION = 1.5.2 APR_VERSION = 1.5.2
APR_UTIL_VERSION = 1.5.4 APR_UTIL_VERSION = 1.5.4
SOURCEFORGE_MROR = netcologne SOURCEFORGE_MROR = netcologne
CPPNET_VERSION = 0.9.4 CPPNET_VERSION = 0.12.0-final
BOOST_VERSION_U = $(subst .,_,$(BOOST_VERSION)) BOOST_VERSION_U = $(subst .,_,$(BOOST_VERSION))
DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.org/dist/cassandra/$(CASSANDRA_VERSION)/apache-cassandra-$(CASSANDRA_VERSION)-bin.tar.gz \ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.org/dist/cassandra/$(CASSANDRA_VERSION)/apache-cassandra-$(CASSANDRA_VERSION)-bin.tar.gz \
...@@ -29,9 +29,9 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o ...@@ -29,9 +29,9 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
httpd-$(HTTPD_VERSION).tar.gz;http://mirror.softaculous.com/apache//httpd/httpd-$(HTTPD_VERSION).tar.gz \ httpd-$(HTTPD_VERSION).tar.gz;http://mirror.softaculous.com/apache//httpd/httpd-$(HTTPD_VERSION).tar.gz \
apr-util-$(APR_UTIL_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-util-$(APR_UTIL_VERSION).tar.gz \ apr-util-$(APR_UTIL_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-util-$(APR_UTIL_VERSION).tar.gz \
apr-$(APR_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-$(APR_VERSION).tar.gz \ apr-$(APR_VERSION).tar.gz;http://www-us.apache.org/dist//apr/apr-$(APR_VERSION).tar.gz \
cpp-netlib-$(CPPNET_VERSION).tar.gz;https://github.com/downloads/cpp-netlib/cpp-netlib/cpp-netlib-$(CPPNET_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.6.tar.gz;8e2a8696ced6c4f9db06c40b2f5a7936;mosquitto-1.3.5.tar.gz;55094ad4dc7c7985377f43d4fc3d09da;OpenIPMI-2.0.21.tar.gz;dc0b42ae40b3f1d0db2a94b75b95fae1;boost_1_57_0.tar.gz;25f9a8ac28beeb5ab84aa98510305299;net-snmp-5.7.3.zip;9f682bd70c717efdd9f15b686d07baee;openssl-1.0.1t.tar.gz;9837746fcf8a6727d46d22ca35953da1;cpp-driver-2.0.1.tar.gz;70bf83e1cbd0d35b7e5ed66fc4dccbb1;libuv-v0.10.36.tar.gz;8eb77b4fee4f311c114a9fee06f5a2ab;httpd-2.4.23.tar.gz;b711ea7d8b75dc8bfdf5a5d7e5253088;apr-util-1.5.4.tar.gz;866825c04da827c6e5f53daff5569f42;apr-1.5.2.tar.gz;98492e965963f852ab29f9e61b2ad700;cpp-netlib-0.9.4.tar.gz;884bb416b63a0c1bd0c8d5a95913136e; DISTFILES_HASHES = apache-cassandra-2.2.6.tar.gz;8e2a8696ced6c4f9db06c40b2f5a7936;mosquitto-1.3.5.tar.gz;55094ad4dc7c7985377f43d4fc3d09da;OpenIPMI-2.0.21.tar.gz;dc0b42ae40b3f1d0db2a94b75b95fae1;boost_1_58_0.tar.gz;5a5d5614d9a07672e1ab2a250b5defc5;net-snmp-5.7.3.zip;9f682bd70c717efdd9f15b686d07baee;openssl-1.0.1t.tar.gz;9837746fcf8a6727d46d22ca35953da1;cpp-driver-2.0.1.tar.gz;70bf83e1cbd0d35b7e5ed66fc4dccbb1;libuv-v0.10.36.tar.gz;8eb77b4fee4f311c114a9fee06f5a2ab;httpd-2.4.23.tar.gz;b711ea7d8b75dc8bfdf5a5d7e5253088;apr-util-1.5.4.tar.gz;866825c04da827c6e5f53daff5569f42;apr-1.5.2.tar.gz;98492e965963f852ab29f9e61b2ad700;cpp-netlib-0.12.0-final.tar.gz;29b87c0e8c1a9e7fbdea5afcec947d53;
FETCH = wget -c --no-check-certificate -O - FETCH = wget -c --no-check-certificate -O -
MD5 = $(if $(shell which md5),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5 <)) MD5 = $(if $(shell which md5),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5 <))
...@@ -311,12 +311,10 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles ...@@ -311,12 +311,10 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \ -DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
-DBOOST_LIBRARYDIR=$(DCDBDEPLOYPATH)/lib \ -DBOOST_LIBRARYDIR=$(DCDBDEPLOYPATH)/lib \
-DBOOST_ROOT=$(DCDBDEPSPATH)/boost_1_57_0/ \ -DBOOST_ROOT=$(DCDBDEPSPATH)/$(B)/ \
$(DCDBDEPSPATH)/$(N) && \ $(DCDBDEPSPATH)/$(N) && \
make -j $(MAKETHREADS) && \ make -j $(MAKETHREADS) && \
install $(DCDBDEPSPATH)/cpp-netlib_build/libs/network/src/libcppnetlib-client-connections.a $(DCDBDEPLOYPATH)/lib && \ make install \
install $(DCDBDEPSPATH)/cpp-netlib_build/libs/network/src/libcppnetlib-server-parsers.a $(DCDBDEPLOYPATH)/lib && \
install $(DCDBDEPSPATH)/cpp-netlib_build/libs/network/src/libcppnetlib-uri.a $(DCDBDEPLOYPATH)/lib && \
touch $(DCDBDEPSPATH)/$(N)/.installed; \ touch $(DCDBDEPSPATH)/$(N)/.installed; \
else \ else \
echo "Skipping cpp-netlib (already built)..."; \ echo "Skipping cpp-netlib (already built)..."; \
......
Supports Markdown
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