From e8a83cd6d8fd54bc90b1cbe1ed49c52d4f65547c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Sat, 28 Nov 2020 19:46:41 -0500 Subject: [PATCH] contrib: update asio, restinio Change-Id: I1e0b62adabcbd1acd5256b771d0621dd46388ff9 --- contrib/src/asio/SHA512SUMS | 2 +- contrib/src/asio/no_tests_examples.patch | 24 ++++++++++++++++++++---- contrib/src/asio/rules.mak | 2 +- contrib/src/restinio/SHA512SUMS | 2 +- contrib/src/restinio/rules.mak | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) mode change 100644 => 100755 contrib/src/asio/no_tests_examples.patch diff --git a/contrib/src/asio/SHA512SUMS b/contrib/src/asio/SHA512SUMS index 1cfc9f7f4e..87d908c491 100644 --- a/contrib/src/asio/SHA512SUMS +++ b/contrib/src/asio/SHA512SUMS @@ -1 +1 @@ -7c2e213ff154bb2e5776b37906d437a62206f973316c94706e6d42e3c2f0866e7d97f3e40225ab5f28bf2c4a33fa0b38a4b75421aef86ddf9f2da0811caa2d00 asio-asio-1-12-2.tar.gz +d99bbf2c4628e0ce43b21ccf5d4f75180c05e5fd84e394dd800f340b1c607f663b43f442253f5cac53394aee3b6bd17aa2082cd10637ac952a83f154ffab332e asio-asio-1-17-0.tar.gz \ No newline at end of file diff --git a/contrib/src/asio/no_tests_examples.patch b/contrib/src/asio/no_tests_examples.patch old mode 100644 new mode 100755 index 23ed319bba..d38f4ed865 --- a/contrib/src/asio/no_tests_examples.patch +++ b/contrib/src/asio/no_tests_examples.patch @@ -1,9 +1,17 @@ -Description: Disable building tests and examples -Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com> +From 1ba8c0b03426b88e00dab833dd6e54cc91f595ec Mon Sep 17 00:00:00 2001 +From: Adrien Béraud <adrien.beraud@savoirfairelinux.com> +Date: Tue, 6 Oct 2020 09:42:45 -0400 +Subject: Disable building tests and examples +--- + src/Makefile.am | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index e9b20e60..f2fbcefe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,17 +1,1 @@ +@@ -1,23 +1,3 @@ -if !STANDALONE -EXAMPLES_CPP03 = examples/cpp03 -endif @@ -16,9 +24,17 @@ Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com> -EXAMPLES_CPP14 = examples/cpp14 -endif - --SUBDIRS = $(EXAMPLES_CPP03) $(EXAMPLES_CPP11) $(EXAMPLES_CPP14) tests +-if HAVE_CXX17 +-EXAMPLES_CPP17 = examples/cpp17 +-endif +- +-SUBDIRS = $(EXAMPLES_CPP03) $(EXAMPLES_CPP11) $(EXAMPLES_CPP14) $(EXAMPLES_CPP17) tests - -DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests - EXTRA_DIST = \ + Makefile.mgw \ + Makefile.msc \ +-- +2.26.2 diff --git a/contrib/src/asio/rules.mak b/contrib/src/asio/rules.mak index d65fbc9e9a..da4381870d 100644 --- a/contrib/src/asio/rules.mak +++ b/contrib/src/asio/rules.mak @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -ASIO_VERSION := asio-1-12-2 +ASIO_VERSION := asio-1-17-0 ASIO_URL := https://github.com/chriskohlhoff/asio/archive/$(ASIO_VERSION).tar.gz # Pure dependency of restinio: do not add to PKGS. diff --git a/contrib/src/restinio/SHA512SUMS b/contrib/src/restinio/SHA512SUMS index 93abd5efad..6e3e48bedf 100644 --- a/contrib/src/restinio/SHA512SUMS +++ b/contrib/src/restinio/SHA512SUMS @@ -1 +1 @@ -e9c315701e210eb4162f39b22e143207d7c5580e9374d401cf7ef2584d8fdc7928392af53032e0d901edcdd77349d105f8c77448c0adadd0f635b6c7e4de3741 restinio-a7a10e419d9089c5b8ee63f5e3098c892f22fae4.tar.gz +3b6322c185b9150b6f0879afa5a14fb5a9f6fac7d6dd4841bcb61ae08212ba92cb75f39add80973c957f8a199cd16d621c4a96de740d3803c9e55d5e98a5642e restinio-2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \ No newline at end of file diff --git a/contrib/src/restinio/rules.mak b/contrib/src/restinio/rules.mak index 4558027e50..90693ff7ac 100644 --- a/contrib/src/restinio/rules.mak +++ b/contrib/src/restinio/rules.mak @@ -1,5 +1,5 @@ # RESTINIO -RESTINIO_VERSION := a7a10e419d9089c5b8ee63f5e3098c892f22fae4 +RESTINIO_VERSION := 2224ffedef52cb2b74645d63d871d61dbd0f165e RESTINIO_URL := https://github.com/aberaud/restinio/archive/$(RESTINIO_VERSION).tar.gz PKGS += restinio -- GitLab