diff --git a/contrib/.gitignore b/contrib/.gitignore index dc89154be72ffe1c25202d9774df3acf0b4a2ea9..1920ef977078d5791aac06a5bc5952851fa8c904 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,4 +7,5 @@ aarch64* i686* apple* build* -msvc* \ No newline at end of file +msvc* +tarballs/* \ No newline at end of file diff --git a/contrib/src/restinio/SHA512SUMS b/contrib/src/restinio/SHA512SUMS index a0a2c37eb79c36a1491352cd3f8d51b3e5e0a914..454844fafa2a161963339479438d047a733c0e28 100644 --- a/contrib/src/restinio/SHA512SUMS +++ b/contrib/src/restinio/SHA512SUMS @@ -1 +1 @@ -3abf5c5f9258b35763d38773b2c21eb73d4887f1594d4b01c9a4db641dfeb34d9b254ca25d2d5a920f820e5337ebd22b41c80b231952797f022b2e26891d0fd5 restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz +3847830d974b3d1bbda482e3f39d3182c3c7d5956bcec223c565da5d856f5367cdb35b9579b474f3053c92b5bbe319206d84a3bb51df528583ee230c5598429b restinio-0.7.2.tar.bz2 diff --git a/contrib/src/restinio/cmake.patch b/contrib/src/restinio/cmake.patch deleted file mode 100644 index 139b8a6bdf46bd77241d74152503b9e4b610b5fb..0000000000000000000000000000000000000000 --- a/contrib/src/restinio/cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ - dev/restinio/CMakeLists.txt | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/dev/restinio/CMakeLists.txt b/dev/restinio/CMakeLists.txt -index df2ecdf..e5f5489 100644 ---- a/dev/restinio/CMakeLists.txt -+++ b/dev/restinio/CMakeLists.txt -@@ -10,11 +10,9 @@ add_library(${RESTINIO} INTERFACE) - add_library(restinio::restinio ALIAS ${RESTINIO}) - - IF (${CMAKE_VERSION} VERSION_LESS "3.8.0") -- set_target_properties(${RESTINIO} PROPERTIES -- CXX_STANDARD 14 -- CXX_STANDARD_REQUIRED YES -- CXX_EXTENSIONS NO -- ) -+ set (CMAKE_CXX_STANDARD 17) -+ set (CMAKE_CXX_STANDARD_REQUIRED on) -+ set (CMAKE_CXX_EXTENSIONS off) - ELSE () - target_compile_features(${RESTINIO} INTERFACE cxx_std_14) - ENDIF () diff --git a/contrib/src/restinio/rules.mak b/contrib/src/restinio/rules.mak index 2774e6b9f95e650317ca35fb2b14f5229e055397..df659d00dc250f77b9db3c5ea25d77b91b96045c 100644 --- a/contrib/src/restinio/rules.mak +++ b/contrib/src/restinio/rules.mak @@ -1,6 +1,7 @@ # RESTINIO -RESTINIO_VERSION := bbaa034dbcc7555ce67df0f8a1475591a7441733 -RESTINIO_URL := https://github.com/aberaud/restinio/archive/$(RESTINIO_VERSION).tar.gz +RESTINIO_VERSION := 0.7.2 +RESTINIO_URL := https://github.com/Stiffstream/restinio/releases/download/v.$(RESTINIO_VERSION)/restinio-$(RESTINIO_VERSION).tar.bz2 +EXPECTED_LITE_URL := https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp PKGS += restinio ifeq ($(call need_pkg,'restinio'),) @@ -17,23 +18,27 @@ endif ifneq ($(call need_pkg,"fmt >= 5.3.0"),) DEPS_restinio += fmt endif -DEPS_restinio += http_parser +DEPS_restinio += llhttp -RESTINIO_CMAKECONF = -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF -DRESTINIO_INSTALL_SAMPLES=OFF \ - -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF -DRESTINIO_FIND_DEPS=ON \ - -DRESTINIO_ALLOW_SOBJECTIZER=OFF -DRESTINIO_USE_BOOST_ASIO=none \ +RESTINIO_CMAKECONF = -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ + -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \ + -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system \ -DZLIB_LIBRARY="$(PREFIX)/lib" -DZLIB_INCLUDE_DIR="$(PREFIX)/include" -$(TARBALLS)/restinio-$(RESTINIO_VERSION).tar.gz: +$(TARBALLS)/restinio-$(RESTINIO_VERSION).tar.bz2: $(call download,$(RESTINIO_URL)) -.sum-restinio: restinio-$(RESTINIO_VERSION).tar.gz +$(TARBALLS)/expected.hpp: + $(call download,$(EXPECTED_LITE_URL)) -restinio: restinio-$(RESTINIO_VERSION).tar.gz +.sum-restinio: restinio-$(RESTINIO_VERSION).tar.bz2 + +restinio: restinio-$(RESTINIO_VERSION).tar.bz2 expected.hpp $(UNPACK) - #$(APPLY) $(SRC)/restinio/cmake.patch $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) $(MOVE) + mkdir -p $(PREFIX)/include/nonstd + cp $(TARBALLS)/expected.hpp $(PREFIX)/include/nonstd/expected.hpp .restinio: restinio .sum-restinio cd $</dev && $(HOSTVARS) $(CMAKE) $(RESTINIO_CMAKECONF) . diff --git a/contrib/tarballs/.gitignore b/contrib/tarballs/.gitignore deleted file mode 100644 index f7c13541d06f00ddf3ba0e5290edfb834110b021..0000000000000000000000000000000000000000 --- a/contrib/tarballs/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.tar.* -*.zip -*.h -*.tgz -*-git/ -.wget-hsts \ No newline at end of file