* [Buildroot] [PATCHv4 0/1] civetweb: new package @ 2013-08-28 3:56 Thomas Davis 2013-08-28 3:56 ` [Buildroot] [PATCHv4 1/1] " Thomas Davis 0 siblings, 1 reply; 5+ messages in thread From: Thomas Davis @ 2013-08-28 3:56 UTC (permalink / raw) To: buildroot 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 -- 1.7.8.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv4 1/1] civetweb: new package 2013-08-28 3:56 [Buildroot] [PATCHv4 0/1] civetweb: new package Thomas Davis @ 2013-08-28 3:56 ` Thomas Davis 2013-09-08 9:11 ` Thomas De Schampheleire 2013-09-20 14:14 ` Peter Korsgaard 0 siblings, 2 replies; 5+ messages in thread From: Thomas Davis @ 2013-08-28 3:56 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Davis <sunsetbrew@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 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)) + -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv4 1/1] civetweb: new package 2013-08-28 3:56 ` [Buildroot] [PATCHv4 1/1] " Thomas Davis @ 2013-09-08 9:11 ` Thomas De Schampheleire 2013-09-20 14:14 ` Peter Korsgaard 1 sibling, 0 replies; 5+ messages in thread From: Thomas De Schampheleire @ 2013-09-08 9:11 UTC (permalink / raw) To: buildroot Hi Thomas, Op 28-aug.-2013 06:02 schreef "Thomas Davis" <sunsetbrew@sunsetbrew.com> het volgende: > > > Signed-off-by: Thomas Davis <sunsetbrew@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@gmail.com> Compile-tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> (compile-tested for a powerpc target) Best regards, Thomas ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv4 1/1] civetweb: new package 2013-08-28 3:56 ` [Buildroot] [PATCHv4 1/1] " Thomas Davis 2013-09-08 9:11 ` Thomas De Schampheleire @ 2013-09-20 14:14 ` Peter Korsgaard 2013-09-20 14:59 ` Thomas Davis 1 sibling, 1 reply; 5+ messages in thread From: Peter Korsgaard @ 2013-09-20 14:14 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Davis <sunsetbrew@sunsetbrew.com> writes: Thomas> Signed-off-by: Thomas Davis <sunsetbrew@sunsetbrew.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv4 1/1] civetweb: new package 2013-09-20 14:14 ` Peter Korsgaard @ 2013-09-20 14:59 ` Thomas Davis 0 siblings, 0 replies; 5+ messages in thread From: Thomas Davis @ 2013-09-20 14:59 UTC (permalink / raw) To: buildroot Thank you! On Fri, Sep 20, 2013 at 10:14 AM, Peter Korsgaard <jacmet@uclibc.org> wrote: > >>>>> "Thomas" == Thomas Davis <sunsetbrew@sunsetbrew.com> writes: > > Thomas> Signed-off-by: Thomas Davis <sunsetbrew@sunsetbrew.com> > > Committed, thanks. > > -- > Bye, Peter Korsgaard > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130920/34d6c4e2/attachment.html> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-20 14:59 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-08-28 3:56 [Buildroot] [PATCHv4 0/1] civetweb: new package Thomas Davis 2013-08-28 3:56 ` [Buildroot] [PATCHv4 1/1] " Thomas Davis 2013-09-08 9:11 ` Thomas De Schampheleire 2013-09-20 14:14 ` Peter Korsgaard 2013-09-20 14:59 ` Thomas Davis
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox