From 35d201ee2625d2dc412016629f649013dce0d199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 9 May 2022 17:02:14 -0400 Subject: [PATCH] contrib: update asio Change-Id: I2cc327e11c80eeae7ca07bd1e1ab33fc357d527f --- contrib/src/asio/SHA512SUMS | 2 +- contrib/src/asio/no_tests_examples.patch | 14 ++++++++++++-- contrib/src/asio/rules.mak | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/src/asio/SHA512SUMS b/contrib/src/asio/SHA512SUMS index 6b3f7d1b8a..7b0a00214f 100644 --- a/contrib/src/asio/SHA512SUMS +++ b/contrib/src/asio/SHA512SUMS @@ -1 +1 @@ -a6d1c5534fef0fe5ac549e1bd20919d180fbfe4c146be40ec6ebfa862534b8551778b0e79a5ba822ed645535e010646909f02f9e1d1f385ed758f07f57351ea8 asio-asio-1-19-2.tar.gz \ No newline at end of file +7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 asio-asio-1-22-1.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 index d38f4ed865..391ffdaecf 100755 --- a/contrib/src/asio/no_tests_examples.patch +++ b/contrib/src/asio/no_tests_examples.patch @@ -11,7 +11,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am index e9b20e60..f2fbcefe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,23 +1,3 @@ +@@ -1,33 +1,3 @@ -if !STANDALONE -EXAMPLES_CPP03 = examples/cpp03 -endif @@ -28,7 +28,17 @@ index e9b20e60..f2fbcefe 100644 -EXAMPLES_CPP17 = examples/cpp17 -endif - --SUBDIRS = $(EXAMPLES_CPP03) $(EXAMPLES_CPP11) $(EXAMPLES_CPP14) $(EXAMPLES_CPP17) tests +-if HAVE_CXX20 +-EXAMPLES_CPP20 = examples/cpp20 +-endif +- +-SUBDIRS = \ +- $(EXAMPLES_CPP03) \ +- $(EXAMPLES_CPP11) \ +- $(EXAMPLES_CPP14) \ +- $(EXAMPLES_CPP17) \ +- $(EXAMPLES_CPP20) \ +- tests - -DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests - diff --git a/contrib/src/asio/rules.mak b/contrib/src/asio/rules.mak index 3c1dd91a9c..7740db3867 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-19-2 +ASIO_VERSION := asio-1-22-1 ASIO_URL := https://github.com/chriskohlhoff/asio/archive/$(ASIO_VERSION).tar.gz # Pure dependency of restinio: do not add to PKGS. -- GitLab