From f413bf2c641954d2202287c3858a007a24e02a6a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Apr 2022 17:46:09 +0200 Subject: [PATCH] package/cppcms: zlib is optional, not mandatory zlib is not mandatory since at least version 1.0.5 and https://github.com/artyom-beilis/cppcms/commit/fc1c25f9c7af440f2fc579b150025addfa5421a5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cppcms/Config.in | 1 - package/cppcms/cppcms.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index 1d7635a83e..25fd93a7d0 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_CPPCMS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_USE_WCHAR - select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE select BR2_PACKAGE_LIBGCRYPT help diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index b289617bbc..530b44427b 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)" -CPPCMS_DEPENDENCIES = zlib pcre libgcrypt +CPPCMS_DEPENDENCIES = pcre libgcrypt ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y) CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF @@ -28,6 +28,13 @@ else CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=ON endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF +CPPCMS_DEPENDENCIES += zlib +else +CPPCMS_CONF_OPTS += -DDISABLE_GZIP=ON +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # posix backend needs monetary.h which isn't available on uClibc CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on