Ver código fonte

Updated buildroot configs

Thomas Davis 12 anos atrás
pai
commit
0fd010d9e0
2 arquivos alterados com 11 adições e 8 exclusões
  1. 6 1
      contrib/buildroot/Config.in
  2. 5 7
      contrib/buildroot/civetweb.mk

+ 6 - 1
contrib/buildroot/Config.in

@@ -9,12 +9,17 @@ config BR2_PACKAGE_CIVETWEB
 if BR2_PACKAGE_CIVETWEB
 
 config BR2_CIVETWEB_WITH_LUA
-	bool "enable LUA support"
+	bool "enable Lua support"
+	# required by the bundled Sqlite3 and Lua code
+	depends on BR2_LARGEFILE
 	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 requires largefile support in toolchain"
+	depends on !BR2_LARGEFILE
+
 endif
 
 comment "civetweb requires a toolchain with PTHREAD support"

+ 5 - 7
contrib/buildroot/civetweb.mk

@@ -5,24 +5,20 @@
 ################################################################################
 
 CIVETWEB_VERSION = 1.3
-CIVETWEB_SOURCE = civetweb-$(CIVETWEB_VERSION).tar.gz
 CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
-CIVETWEB_COPT = $(TARGET_CFLAGS)
 CIVETWEB_CONF_OPT = TARGET_OS=LINUX
+CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
 CIVETWEB_LDFLAGS = $(TARGET_LDFLAGS)
+CIVETWEB_SYSCONFDIR = /etc
 CIVETWEB_HTMLDIR = /var/www
 
 ifneq ($(BR2_LARGEFILE),y)
 	CIVETWEB_COPT += -DSQLITE_DISABLE_LFS
 endif
 
-#ifeq ($(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),y)
-#	CIVETWEB_COPT += -DHAVE_POSIX_FALLOCATE=0
-#endif
-
 ifeq ($(BR2_INET_IPV6),y)
 	CIVETWEB_CONF_OPT += WITH_IPV6=1
 endif
@@ -47,8 +43,10 @@ endef
 define CIVETWEB_INSTALL_TARGET_CMDS
 	$(MAKE) CC="$(TARGET_CC)" -C $(@D) install \
 		DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
+		CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
 		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
-		PREFIX="$(TARGET_DIR)/usr/local" \
+		SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
+		PREFIX="$(TARGET_DIR)/usr" \
 		$(CIVETWEB_CONF_OPT) \
 		COPT='$(CIVETWEB_COPT)'
 endef