From 2da70bbf8f886762d7004d6ff51ca171d4c0e221 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Date: Tue, 13 Feb 2018 15:50:31 -0500 Subject: [PATCH] contrib: Fix failure of .deb packages Due to restbed attempting to download tarballs at the time it is unpacked. Change-Id: I468c5035ea1351264a6040a7fd86df48ee1fc4c9 --- contrib/src/kashmir-dependency/SHA512SUMS | 1 + contrib/src/kashmir-dependency/rules.mak | 37 +++++++++++++++++++++++ contrib/src/restbed/rules.mak | 11 ++----- 3 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 contrib/src/kashmir-dependency/SHA512SUMS create mode 100644 contrib/src/kashmir-dependency/rules.mak diff --git a/contrib/src/kashmir-dependency/SHA512SUMS b/contrib/src/kashmir-dependency/SHA512SUMS new file mode 100644 index 0000000000..0579f7a0c7 --- /dev/null +++ b/contrib/src/kashmir-dependency/SHA512SUMS @@ -0,0 +1 @@ +e86964f4269e9f8b760b749163b92d6d3c72a94a8c5732e3c36c41fc74e2b16de35e2494c3ffe468e38a09aafe58a973fab702da0d632b5eb829480da6b32376 kashmir-dependency-2f3913f49c4ac7f9bff9224db5178f6f8f0ff3ee.tar.gz diff --git a/contrib/src/kashmir-dependency/rules.mak b/contrib/src/kashmir-dependency/rules.mak new file mode 100644 index 0000000000..c8639d983a --- /dev/null +++ b/contrib/src/kashmir-dependency/rules.mak @@ -0,0 +1,37 @@ +# +# Copyright (C) 2018 Savoir-faire Linux Inc. +# +# Author: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +KASHMIR_VERSION := 2f3913f49c4ac7f9bff9224db5178f6f8f0ff3ee +KASHMIR_URL := https://github.com/Corvusoft/kashmir-dependency/archive/$(KASHMIR_VERSION).tar.gz + +PKGS += kashmir-dependency + +$(TARBALLS)/kashmir-dependency-$(KASHMIR_VERSION).tar.gz: + $(call download,$(KASHMIR_URL)) + +kashmir-dependency: kashmir-dependency-$(KASHMIR_VERSION).tar.gz + $(UNPACK) + $(MOVE) + +.kashmir-dependency: kashmir-dependency .sum-kashmir-dependency + cd $< && cp -r kashmir $(PREFIX)/include + touch $@ + +.sum-kashmir-dependency: kashmir-dependency-$(KASHMIR_VERSION).tar.gz diff --git a/contrib/src/restbed/rules.mak b/contrib/src/restbed/rules.mak index adf2c033a4..f3af25be6d 100644 --- a/contrib/src/restbed/rules.mak +++ b/contrib/src/restbed/rules.mak @@ -31,23 +31,18 @@ endif $(TARBALLS)/restbed-$(RESTBED_VERSION).tar.gz: $(call download,$(RESTBED_URL)) -DEPS_restbed = asio +DEPS_restbed = asio kashmir-dependency RESTBED_CONF = -DBUILD_TESTS=NO \ -DBUILD_EXAMPLES=NO \ -DBUILD_SSL=NO \ -DBUILD_SHARED=NO \ + -DCMAKE_INCLUDE_PATH=$(PREFIX)/include \ -DCMAKE_INSTALL_PREFIX=$(PREFIX) \ -DCMAKE_INSTALL_LIBDIR=lib -$(TARBALLS)/kashmir.tar.gz: - $(call download,https://github.com/Corvusoft/kashmir-dependency/archive/master.tar.gz) - -restbed: restbed-$(RESTBED_VERSION).tar.gz kashmir.tar.gz .sum-restbed +restbed: restbed-$(RESTBED_VERSION).tar.gz .sum-restbed $(UNPACK) - rm -rf $(UNPACK_DIR)/dependency/kashmir - mv kashmir-dependency-master $(UNPACK_DIR)/dependency/kashmir - $(APPLY) $(SRC)/restbed/findkashmir.patch $(APPLY) $(SRC)/restbed/strand.patch $(APPLY) $(SRC)/restbed/async_read_until.patch $(MOVE) -- GitLab