Commit Graph

21 Commits

Author SHA1 Message Date
Romain Naour
5a9b918ebd package/civetweb: add .hash file
Similar to jquery-keyboard, it seems the civetweb tarball on the
autobuilder is corrupt.  Fix it by adding a .hash file so it falls back to
our s.b.o mirror.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-06-18 22:49:32 +02:00
Peter Korsgaard
ea94747798 civetweb: use TARGET_CONFIGURE_OPTS
Instead of explicitly handling CC/LD/CFLAGS. No functional change, but it is
cleaner like this.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-04-27 22:35:57 +02:00
Peter Korsgaard
efd49e3366 civetweb: rename lua option to match naming convention
Suboptions of package foo should be prefixed with BR2_PACKAGE_FOO, not just
BR2_FOO.

Also add Config.in.legacy handling for it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-04-27 22:29:05 +02:00
Peter Korsgaard
fc882cf2ad civetweb: unbreak static linking builds
Fixes
http://autobuild.buildroot.net/results/0a5/0a555a4ad0d100a7d402908b1f26d213de0ec127/
http://autobuild.buildroot.net/results/97b/97b014b2a611ba2528dda86bb05d6ffbec51c21d/
http://autobuild.buildroot.net/results/c2e/c2e314127be74a41bcdb78f04bc51fe2edef0b0f/
http://autobuild.buildroot.net/results/734/7346a89b5e7dd3633ecf9ac5292379ec9e832b2e/

And many more.

It is only the lua suboption that needs dlopen support, so adjust the
toolchain dependencies and CIVETWEB_LIBS handling to match.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-04-27 22:03:12 +02:00
Gustavo Zacarias
79ce08bbdc packages: remove non-IPv6 dependencies and tweaks
Now that IPv6 is mandatory remove package dependencies and conditionals
for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:06:35 +02:00
Gustavo Zacarias
f4716f79a0 packages: remove (non-)lfs dependencies and tweaks
Now that largefile is mandatory removes package dependencies and
conditionals.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-01 22:47:22 +02:00
Jerzy Grzegorek
bd8c733fb4 packages: indentation cleanup
This commit doesn't touch infra packages.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-31 13:57:41 +02:00
Fabio Porcedda
a9079c7d86 package/civetweb: fix build error on a host with make v4.0
Add a patch to fix a typo that on a system with make v4.0 and
BR2_CIVETWEB_WITH_LUA=y fails to build:
  Makefile:203: *** mixed implicit and normal rules.  Stop.

The patch was not sent upstream because this problem is already fixed on
master.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-28 10:02:21 +01:00
Maxime Hadjinlian
4573ba9cec civetweb: bump version
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-27 01:08:31 +01:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Max Filippov
0e90b33c74 Revert "civetweb: fix build for xtensa"
This reverts commit 37084ead50.
Now that -mtext-section-literals is specified in the xtensa ABI this fix
is no longer needed.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-03 21:35:38 +02:00
Jerzy Grzegorek
3033bc0c6e package: remove the empty trailing line(s)
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-04 10:39:29 +01:00
Baruch Siach
37084ead50 civetweb: fix build for xtensa
The civetweb package bundled sqlite3 generates an object that is too large for
the xtensa default placement of literals in a dedicated section. Use
-mtext-section-literal to place literals in the text section.

Fixes
http://autobuild.buildroot.net/results/d14/d142f3ce17ab22cc39f9117c114318c1b5cadfc5/.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-31 11:57:54 +01:00
Mischa Jonker
e5c392830e packages: convert Github http:// users to the github helper
[Thomas: taken from Mischa original github patch.]

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 22:38:26 +01:00
Thomas De Schampheleire
be084204eb Config.in files: add missing dependencies to toolchain option comments
When a package A depends on config option B and toolchain option C, then
the comment that is given when C is not fulfilled should also depend on B.
For example:

config BR2_PACKAGE_A
	depends on BR2_B
	depends on BR2_LARGEFILE
	depends on BR2_WCHAR

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

This comment should actually be:

comment "A needs a toolchain w/ largefile, wchar"
	depends on BR2_B
	depends on !BR2_LARGEFILE || !BR2_WCHAR

or if possible (typically when B is a package config option declared in that
same Config.in file):

if BR2_B

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

[other config options depending on B]

endif

Otherwise, the comment would be visible even though the other dependencies
are not met.

This patch adds such missing dependencies, and changes existing such
dependencies from
  depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC
to
  depends on BR2_BASE_DEP
  depends on !BR2_TOOLCHAIN_USES_GLIBC
so that (positive) base dependencies are separate from the (negative)
toolchain dependencies. This strategy makes it easier to write such comments
(because one can simply copy the base dependency from the actual package
config option), but also avoids complex and long boolean expressions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (untested)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 23:59:57 +01:00
Jerzy Grzegorek
df70822c62 package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable
According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]
FOO_VERSION = tag or full commit ID
FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
[...]
- The tarball name generated by github matches the default one from
  Buildroot (...),
  so it is not necessary to specify it in the +.mk+ file.
"
This commit makes the appropriate changes.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-11-02 18:26:41 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Gustavo Zacarias
a5e44382cd civetweb: needs mmu
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-09 22:35:00 +02:00
Peter Korsgaard
3cf5b30191 civetweb: fix static linking with openssl
Fixes http://autobuild.buildroot.net/results/acf/acfefc4f0f23ef646094ec427c9502eab7b86736/

Corrects a number of issues with the openssl handling:
 - Libraries have to be listed after the object files using them, so pass
   openssl linker statements in LIBS rather than COPT
 - Openssl support library is libcrypto, not libcrypt
 - Openssl need zlib

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-24 14:16:17 +02:00
Peter Korsgaard
eb8208bf1d civetweb: use TARGET_LDFLAGS
We should use our LDFLAGS when building as well. At the same time, drop the
unused CIVETWEB_LDFLAGS.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-24 14:11:54 +02:00
Thomas Davis
1fe1165e61 civetweb: new package
Signed-off-by: Thomas Davis <sunsetbrew@sunsetbrew.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-20 16:14:10 +02:00