From 07a986df2671fbb4bb32afb1d852cce54ebac0e5 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 12 Jan 2023 16:49:20 +0000 Subject: [PATCH] make libhttpserver patches unconditional --- deps/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index c35f274d4e..23ef204cd9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -101,7 +101,7 @@ endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a cd libhttpserver && rm -rf libhttpserver-*/ || true cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz -ifeq ($(REQUIRE_PATCH), true) +#ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/deferred_response.hpp < ../deferred_response.hpp.patch @@ -112,7 +112,7 @@ ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/http_response.hpp < ../http_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/string_response.hpp < ../string_response.hpp.patch cd libhttpserver/libhttpserver && patch -p0 < ../re2_regex.patch -endif +#endif cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch ifeq ($(UNAME_S),FreeBSD)