Commit 58369fd3 authored by daniele's avatar daniele
Browse files

@Makefile: Included cpp-netlib in the build. Updated HTTPD version.

Added patch for cpp-netlib
parent da98af6d
......@@ -11,10 +11,11 @@ SNMP_VERSION = 5.7.3
OPENSSL_VERSION = 1.0.1t
CPPDRV_VERSION = 2.0.1
LIBUV_VERSION = 0.10.36
HTTPD_VERSION = 2.4.18
HTTPD_VERSION = 2.4.23
APR_VERSION = 1.5.2
APR_UTIL_VERSION = 1.5.4
SOURCEFORGE_MROR = netcologne
CPPNET_VERSION = 0.9.4
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 \
......@@ -27,9 +28,10 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
libuv-v$(LIBUV_VERSION).tar.gz;http://dist.libuv.org/dist/v$(LIBUV_VERSION)/libuv-v$(LIBUV_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-$(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
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.18.tar.gz;2f90ce3426541817e0dfd01cae086b60;apr-util-1.5.4.tar.gz;866825c04da827c6e5f53daff5569f42;apr-1.5.2.tar.gz;98492e965963f852ab29f9e61b2ad700;
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;
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 <))
......@@ -292,6 +294,34 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
else \
echo "Skipping cpp-driver (already built)..."; \
fi
$(eval N := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*cpp-netlib/cpp-netlib/' | sed 's/\ .*//'))
@if [ ! -e $(DCDBDEPSPATH)/$(N)/.installed ]; then \
echo ""; \
echo "Building cpp-netlib..."; \
if [ -e $(DCDBDEPSPATH)/patches/$(N).patch ]; then \
echo "Patching cpp-netlib..."; \
cd $(DCDBDEPSPATH)/$(N) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(N).patch || true); \
fi; \
mkdir -p $(DCDBDEPSPATH)/cpp-netlib_build; \
cd $(DCDBDEPSPATH)/cpp-netlib_build && \
cmake $(CMAKE_CROSS_FLAGS) \
-DCMAKE_CXX_FLAGS="$(CXX11FLAGS) -Wno-unused-command-line-argument -L$(DCDBDEPLOYPATH)/lib " \
-DOPENSSL_ROOT_DIR=$(DCDBDEPLOYPATH)/ \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH)/ \
-DBOOST_LIBRARYDIR=$(DCDBDEPLOYPATH)/lib \
-DBOOST_ROOT=$(DCDBDEPSPATH)/boost_1_57_0/ \
$(DCDBDEPSPATH)/$(N) && \
make -j $(MAKETHREADS) && \
install $(DCDBDEPSPATH)/cpp-netlib_build/libs/network/src/libcppnetlib-client-connections.a $(DCDBDEPLOYPATH)/lib && \
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; \
else \
echo "Skipping cpp-netlib (already built)..."; \
fi
$(eval H := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*httpd/httpd/' | sed 's/\ .*//'))
$(eval A := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*apr/apr/' | sed 's/\ .*//'))
......
--- cpp-netlib-0.9.4.orig/CMakeLists.txt 2012-04-20 19:37:42.000000000 +0200
+++ cpp-netlib-0.9.4/CMakeLists.txt 2016-08-09 10:01:06.261095338 +0200
@@ -7,7 +7,7 @@
project(CPP-NETLIB)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTI_THREADED ON)
-find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options )
+find_package( Boost 1.45.0 REQUIRED system regex date_time thread filesystem program_options )
find_package( OpenSSL )
find_package( Threads )
set(CMAKE_VERBOSE_MAKEFILE true)
@@ -30,11 +30,6 @@
include_directories(${Boost_INCLUDE_DIRS})
enable_testing()
add_subdirectory(libs/network/src)
- add_subdirectory(libs/network/test)
- if (NOT MSVC)
- add_subdirectory(libs/mime/test)
- endif(NOT MSVC)
- add_subdirectory(libs/network/example)
endif(Boost_FOUND)
enable_testing()
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