nghttp module: Update to v1.22, use submodule instead of in-tree source

marcospanghero · May 17, 2017 · b6063d1 · b6063d1
1 parent 4dad7ab
commit b6063d1
Show file tree

Hide file tree

Showing 47 changed files with 13 additions and 29,806 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "components/aws_iot/aws-iot-device-sdk-embedded-C"]
 	path = components/aws_iot/aws-iot-device-sdk-embedded-C
 	url = https://github.com/espressif/aws-iot-device-sdk-embedded-C.git
+[submodule "components/nghttp/nghttp2"]
+	path = components/nghttp/nghttp2
+	url = https://github.com/nghttp2/nghttp2.git
diff --git a/components/nghttp/component.mk b/components/nghttp/component.mk
@@ -2,6 +2,11 @@
 # Component Makefile
 #
 
-COMPONENT_ADD_INCLUDEDIRS := port/include include
+COMPONENT_ADD_INCLUDEDIRS := port/include nghttp2/lib/includes
 
-COMPONENT_SRCDIRS := library port
+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))