From 6f7d6dbde45ed8bf16cf937cdec1357dbae60cfd Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Tue, 11 Jul 2017 11:49:55 +0800 Subject: [PATCH] nghttp2: Add submodule to COMPONENT_SUBMODULES, update to release v1.24 Removes need for -DNDEBUG hack in component.mk (fixed upstream). --- components/nghttp/component.mk | 5 +---- components/nghttp/nghttp2 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/nghttp/component.mk b/components/nghttp/component.mk index fab616cc4..2a69cd5e1 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 port -# 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 2f146e4d4..3bcc416e1 160000 --- a/components/nghttp/nghttp2 +++ b/components/nghttp/nghttp2 @@ -1 +1 @@ -Subproject commit 2f146e4d4cfe895d65599b87df7d847435f0e1b4 +Subproject commit 3bcc416e13cc790e2fb45fcfe9111d38609c5032