Commit 12996f11 authored by aviau's avatar aviau

contrib - restbed: specify ASIO commit

This modifies the restbed contrib rules to use a specific version of
asio in order to make the build reproductible and more stable.

Change-Id: Ieb620da14894b8574fe57d775d13c446c792a27b
Tuleap: #1017
parent 168fe137
......@@ -20,6 +20,8 @@
RESTBED_VERSION := 4.0
RESTBED_URL := https://github.com/Corvusoft/restbed/archive/$(RESTBED_VERSION).tar.gz
ASIO_VERSION := 722f7e2be05a51c69644662ec514d6149b2b7ef8
ASIO_URL := https://github.com/Corvusoft/asio-dependency/archive/$(ASIO_VERSION).tar.gz
ifeq ($(call need_pkg,"restbed >= 4.0"),)
PKGS_FOUND += restbed
......@@ -28,6 +30,9 @@ endif
$(TARBALLS)/restbed-$(RESTBED_VERSION).tar.gz:
$(call download,$(RESTBED_URL))
$(TARBALLS)/asio-dependency-$(ASIO_VERSION).tar.gz:
$(call download,$(ASIO_URL))
RESTBED_CONF = -DBUILD_TESTS=NO \
-DBUILD_EXAMPLES=NO \
-DBUILD_SSL=NO \
......@@ -36,9 +41,16 @@ RESTBED_CONF = -DBUILD_TESTS=NO \
-DCMAKE_CXX_COMPILER=g++ \
-DCMAKE_INSTALL_PREFIX=$(PREFIX)
restbed: restbed-$(RESTBED_VERSION).tar.gz
restbed-asio-dependency: asio-dependency-$(ASIO_VERSION).tar.gz
$(UNPACK)
$(MOVE)
.restbed-asio-dependency: restbed-asio-dependency
touch $@
restbed: restbed-$(RESTBED_VERSION).tar.gz .restbed-asio-dependency
$(UNPACK)
git clone https://github.com/Corvusoft/asio-dependency.git $(UNPACK_DIR)/dependency/asio/
cp -r restbed-asio-dependency/asio $(UNPACK_DIR)/dependency/asio
cd $(UNPACK_DIR)/dependency/asio/asio && patch -fp1 < ../../../../../src/restbed/conditional_sslv3.patch
cd $(UNPACK_DIR)/ && ls && patch -p0 < ../../src/restbed/CMakeLists.patch
$(MOVE)
......@@ -48,4 +60,4 @@ restbed: restbed-$(RESTBED_VERSION).tar.gz
cd $< && $(MAKE) install
touch $@
.sum-restbed: restbed-$(RESTBED_VERSION).tar.gz
\ No newline at end of file
.sum-restbed: restbed-$(RESTBED_VERSION).tar.gz
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