[Buildroot] [PATCHv4 1/1] civetweb: new package
Thomas De Schampheleire
patrickdepinguin at gmail.com
Sun Sep 8 09:11:07 UTC 2013
Hi Thomas,
Op 28-aug.-2013 06:02 schreef "Thomas Davis"
<sunsetbrew at sunsetbrew.com> het volgende:
>
>
> Signed-off-by: Thomas Davis <sunsetbrew at sunsetbrew.com>
> ---
> 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
>
> diff --git a/package/Config.in b/package/Config.in
> index 7069d77..25433b6 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
> new file mode 100644
> index 0000000..2334fdf
> --- /dev/null
> +++ b/package/civetweb/Config.in
> @@ -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
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.
> diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
> new file mode 100644
> index 0000000..e34da06
> --- /dev/null
> +++ b/package/civetweb/civetweb.mk
> @@ -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)" \
> + 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 <thomas.de.schampheleire at gmail.com>
Compile-tested-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
(compile-tested for a powerpc target)
Best regards,
Thomas
More information about the buildroot
mailing list