Merge from bittboy/buildroot@db180c0

package/civetweb/0001-modlua.ini-include-dlfcn.h.patch

@@ -0,0 +1,34 @@
+From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 29 Nov 2018 21:43:28 +0100
+Subject: [PATCH] modlua.ini: include dlfcn.h
+
+dlfcn.h must be included to be able to use dlopen otherwise build will
+fail on:
+src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function)
+  lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY);
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/civetweb/civetweb/pull/706]
+---
+ src/mod_lua.inl | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mod_lua.inl b/src/mod_lua.inl
+index 97a5de1e..ce7a4b2e 100644
+--- a/src/mod_lua.inl
++++ b/src/mod_lua.inl
+@@ -2,6 +2,7 @@
+  * See https://github.com/civetweb/civetweb/
+  */
+ 
++#include <dlfcn.h>
+ #include "civetweb_lua.h"
+ #include "civetweb_private_lua.h"
+ 
+-- 
+2.14.1
+

package/civetweb/Config.in

@@ -0,0 +1,40 @@
+config BR2_PACKAGE_CIVETWEB
+	bool "civetweb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_CIVETWEB_SERVER if !BR2_PACKAGE_CIVETWEB_LIB
+	help
+	  Full featured embedded web server with Lua support.
+
+	  https://sourceforge.net/projects/civetweb
+
+if BR2_PACKAGE_CIVETWEB
+
+config BR2_PACKAGE_CIVETWEB_SERVER
+	bool "enable the web server application"
+	help
+	  Include the web server and its config files.
+
+config BR2_PACKAGE_CIVETWEB_LIB
+	bool "enable library for embedding"
+	help
+	  Enable the civetweb library for embedding in another
+	  application.
+
+config BR2_PACKAGE_CIVETWEB_WITH_LUA
+	bool "enable Lua support"
+	# required by the bundled Sqlite3 and Lua code
+	depends on !BR2_STATIC_LIBS
+	help
+	  Enable Lua support in Civetweb. Note that this will use a
+	  version of Lua and Sqlite bundled within the Civetweb
+	  sources, and not the packages from Buildroot.
+
+comment "lua support needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
+endif
+
+comment "civetweb needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/civetweb/civetweb.hash

@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42  civetweb-1.11.tar.gz
+sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706  LICENSE.md

package/civetweb/civetweb.mk

@@ -0,0 +1,87 @@
+################################################################################
+#
+# civetweb
+#
+################################################################################
+
+CIVETWEB_VERSION = 1.11
+CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION))
+CIVETWEB_LICENSE = MIT
+CIVETWEB_LICENSE_FILES = LICENSE.md
+
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \
+	$(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
+CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0
+CIVETWEB_LIBS = -lpthread -lm
+CIVETWEB_SYSCONFDIR = /etc
+CIVETWEB_HTMLDIR = /var/www
+CIVETWEB_INSTALL_OPTS = \
+	DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
+	CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
+	HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
+	SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)"
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),)
+CIVETWEB_COPT += -DNO_ATOMICS=1
+endif
+
+ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)
+CIVETWEB_CONF_OPTS += WITH_LUA=1
+CIVETWEB_LIBS += -ldl
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+CIVETWEB_COPT += -DNO_SSL_DL
+CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
+CIVETWEB_DEPENDENCIES += openssl host-pkgconf
+else
+CIVETWEB_COPT += -DNO_SSL
+endif
+
+ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
+CIVETWEB_BUILD_TARGETS += build
+CIVETWEB_INSTALL_TARGETS += install
+endif
+
+ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
+CIVETWEB_INSTALL_STAGING = YES
+CIVETWEB_INSTALL_TARGETS += install-headers
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
+CIVETWEB_BUILD_TARGETS += lib
+CIVETWEB_INSTALL_TARGETS += install-lib
+endif
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
+CIVETWEB_BUILD_TARGETS += slib
+CIVETWEB_INSTALL_TARGETS += install-slib
+CIVETWEB_COPT += -fPIC
+endif
+
+endif # BR2_PACKAGE_CIVETWEB_LIB
+
+define CIVETWEB_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_BUILD_TARGETS) \
+		$(CIVETWEB_CONF_OPTS) \
+		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
+endef
+
+define CIVETWEB_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
+		PREFIX="$(STAGING_DIR)/usr" \
+		$(CIVETWEB_INSTALL_OPTS) \
+		$(CIVETWEB_CONF_OPTS) \
+		COPT='$(CIVETWEB_COPT)'
+endef
+
+define CIVETWEB_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/include
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
+		PREFIX="$(TARGET_DIR)/usr" \
+		$(CIVETWEB_INSTALL_OPTS) \
+		$(CIVETWEB_CONF_OPTS) \
+		COPT='$(CIVETWEB_COPT)'
+endef
+
+$(eval $(generic-package))