From: Angus Gratton Date: Tue, 11 Jul 2017 03:49:55 +0000 (+0800) Subject: nghttp2: Add submodule to COMPONENT_SUBMODULES, update to release v1.24 X-Git-Tag: v3.1-dev~464^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=083f7d667b9be8b1d5e6f2807f92d71a3010d6e6;p=esp-idf nghttp2: Add submodule to COMPONENT_SUBMODULES, update to release v1.24 Removes need for -DNDEBUG hack in component.mk (fixed upstream). --- diff --git a/components/nghttp/component.mk b/components/nghttp/component.mk index e9148acc90..b73161e47c 100644 --- a/components/nghttp/component.mk +++ b/components/nghttp/component.mk @@ -6,7 +6,4 @@ COMPONENT_ADD_INCLUDEDIRS := port/include nghttp2/lib/includes COMPONENT_SRCDIRS := nghttp2/lib -# nghttp2_session.c uses assert(0) in place of abort() in some functions, -# that miss a return statement if assertions are disabled. -# So it always needs assertions to be enabled -nghttp2/lib/nghttp2_session.o: CPPFLAGS := $(filter-out -DNDEBUG,$(CPPFLAGS)) +COMPONENT_SUBMODULES := nghttp2 diff --git a/components/nghttp/nghttp2 b/components/nghttp/nghttp2 index 2f146e4d4c..3bcc416e13 160000 --- a/components/nghttp/nghttp2 +++ b/components/nghttp/nghttp2 @@ -1 +1 @@ -Subproject commit 2f146e4d4cfe895d65599b87df7d847435f0e1b4 +Subproject commit 3bcc416e13cc790e2fb45fcfe9111d38609c5032