All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency
@ 2020-03-17 21:14 Fabrice Fontaine
  2020-03-21 15:57 ` Thomas Petazzoni
  2020-04-06 16:17 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-03-17 21:14 UTC (permalink / raw)
  To: buildroot

zlib is an optional dependency since version 1.11 and
https://github.com/civetweb/civetweb/commit/6b8b15935378f71323ff95f907fa0d33841deac0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/civetweb/civetweb.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index 99da1b6f06..f05b29f3cd 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -38,6 +38,12 @@ else
 CIVETWEB_COPT += -DNO_SSL
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+CIVETWEB_CONF_OPTS += WITH_ZLIB=1
+CIVETWEB_LIBS += -lz
+CIVETWEB_DEPENDENCIES += zlib
+endif
+
 ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
 CIVETWEB_BUILD_TARGETS += build
 CIVETWEB_INSTALL_TARGETS += install
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency
  2020-03-17 21:14 [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency Fabrice Fontaine
@ 2020-03-21 15:57 ` Thomas Petazzoni
  2020-04-06 16:17 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-03-21 15:57 UTC (permalink / raw)
  To: buildroot

On Tue, 17 Mar 2020 22:14:57 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> zlib is an optional dependency since version 1.11 and
> https://github.com/civetweb/civetweb/commit/6b8b15935378f71323ff95f907fa0d33841deac0
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/civetweb/civetweb.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency
  2020-03-17 21:14 [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency Fabrice Fontaine
  2020-03-21 15:57 ` Thomas Petazzoni
@ 2020-04-06 16:17 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-04-06 16:17 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > zlib is an optional dependency since version 1.11 and
 > https://github.com/civetweb/civetweb/commit/6b8b15935378f71323ff95f907fa0d33841deac0

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, 2019.11.x and 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-04-06 16:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-17 21:14 [Buildroot] [PATCH 1/1] package/civetweb: add zlib optional dependency Fabrice Fontaine
2020-03-21 15:57 ` Thomas Petazzoni
2020-04-06 16:17 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.