Skip to contentSkip to conversation

civetweb: new package

PATCH New Thomas Davis 3 participants 5 messages Aug 28, 2013 – Sep 20, 2013

lore
Share & tools
lore

Thomas Davis

author
#0 lore raw

v4 cover civetweb: new package

Submission #4 with recommended changes.

1. Changed all cased lua/LUA to Lua in both the patch and the source repo.
2. Removed unneeded CIVETWEB_SOURCE variable
3. Changed install prefix from /usr/local to /usr
4. Moved default configuration file location from /usr/local/etc to /etc

Thank you,
Thomas Davis

Thomas Davis (1):
civetweb: new package

 package/Config.in            |    1 +
 package/civetweb/Config.in   |   26 +++++++++++++++++++
 package/civetweb/civetweb.mk |   55 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 package/civetweb/Config.in
 create mode 100644 package/civetweb/civetweb.mk
Signature · 1 line
1.7.8.3
author
#1 lore raw

PATCH v4 1/1 civetweb: new package

Signed-off-by Thomas Davis <[email protected]>
---
 package/Config.in            |    1 +
 package/civetweb/Config.in   |   26 +++++++++++++++++++
 package/civetweb/civetweb.mk |   55 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 package/civetweb/Config.in
 create mode 100644 package/civetweb/civetweb.mk
package/Config.in +1 -0
index 7069d77..25433b6 100644
@@ -719,6 +719,7 @@ source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/chrony/Config.in"
+source "package/civetweb/Config.in"
 source "package/connman/Config.in"
 source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
package/civetweb/Config.in new file +26 -0
new file mode 100644
index 0000000..2334fdf
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_CIVETWEB
+	bool "civetweb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Full featured embedded web server with Lua support.
+	  
+	  https://sourceforge.net/projects/civetweb
+
+if BR2_PACKAGE_CIVETWEB
+
+config BR2_CIVETWEB_WITH_LUA
+	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"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
package/civetweb/civetweb.mk new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
1.7.8.3
#2 lore raw

PATCH v4 1/1 civetweb: new package

Hi Thomas,

Op 28-aug.-2013 06:02 schreef "Thomas Davis"
<[email protected]> het volgende:

Quoted 45 lines
Signed-off-by Thomas Davis <[email protected]>
---
 package/Config.in            |    1 +
 package/civetweb/Config.in   |   26 +++++++++++++++++++
 package/civetweb/civetweb.mk |   55 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 package/civetweb/Config.in
 create mode 100644 package/civetweb/civetweb.mk
package/Config.in +1 -0
index 7069d77..25433b6 100644
@@ -719,6 +719,7 @@ source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/chrony/Config.in"
+source "package/civetweb/Config.in"
 source "package/connman/Config.in"
 source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
package/civetweb/Config.in new file +16 -0
new file mode 100644
index 0000000..2334fdf
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_CIVETWEB
+       bool "civetweb"
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       help
+         Full featured embedded web server with Lua support.
+
+         https://sourceforge.net/projects/civetweb
+
+if BR2_PACKAGE_CIVETWEB
+
+config BR2_CIVETWEB_WITH_LUA
+       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

package/civetweb/Config.in line 26

Quoted 10 lines
package/civetweb/Config.in new file +10 -0
+         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"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

We generally write simply 'thread support', but I am preparing a line-up of all these comments as there is a myriad of formats, so IMO this is not a blocking factor for acceptance of this patch.

Quoted 51 lines
package/civetweb/civetweb.mk new file +45 -0
new file mode 100644
index 0000000..e34da06
@@ -0,0 +1,55 @@
+################################################################################
+#
+# civetweb
+#
+################################################################################
+
+CIVETWEB_VERSION = 1.3
+CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
+CIVETWEB_LICENSE = MIT
+CIVETWEB_LICENSE_FILES = LICENSE.md
+
+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_INET_IPV6),y)
+       CIVETWEB_CONF_OPT += WITH_IPV6=1
+endif
+
+ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
+       CIVETWEB_CONF_OPT += WITH_LUA=1
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+       CIVETWEB_COPT += -DNO_SSL_DL -lcrypt -lssl
+       CIVETWEB_DEPENDENCIES += openssl
+else
+       CIVETWEB_COPT += -DNO_SSL
+endif
+
+define CIVETWEB_BUILD_CMDS
+       $(MAKE) CC="$(TARGET_CC)" -C $(@D) build \
+               $(CIVETWEB_CONF_OPT) \
+               COPT="$(CIVETWEB_COPT)"
+endef
+
+define CIVETWEB_INSTALL_TARGET_CMDS
+       $(MAKE) CC="$(TARGET_CC)" -C $(@D) install \
+               DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \

package/civetweb/civetweb.mk line 55

Quoted 10 lines
package/civetweb/civetweb.mk new file +10 -0
+               CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
+               HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
+               SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
+               PREFIX="$(TARGET_DIR)/usr" \
+               $(CIVETWEB_CONF_OPT) \
+               COPT='$(CIVETWEB_COPT)'
+endef
+
+$(eval $(generic-package))
+

This last empty line can be removed, but again: it's a minor detail.

Hence:

Acked-by Thomas De Schampheleire <[email protected]>
Compile-tested-by Thomas De Schampheleire <[email protected]>

(compile-tested for a powerpc target)

Best regards,
Thomas

author
#4 lore raw

PATCH v4 1/1 civetweb: new package

Thank you!

Quoted 9 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Davis <[email protected]> writes:

Thomas> Signed-off-by: Thomas Davis <[email protected]>

Committed, thanks.

--
Bye, Peter Korsgaard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130920/34d6c4e2/attachment.html>