From 32045a73a39904617a3c281e02ccf93ad953b5d5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Apr 2022 17:46:10 +0200 Subject: [PATCH] package/cppcms: libgcrypt is optional, not mandatory If libgcrypt (or openssl) is not enabled, aes_encryptor is disabled Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cppcms/Config.in | 2 -- package/cppcms/cppcms.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index 25fd93a7d0..6c0bff934c 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -1,12 +1,10 @@ config BR2_PACKAGE_CPPCMS bool "cppcms" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_USE_WCHAR select BR2_PACKAGE_PCRE - select BR2_PACKAGE_LIBGCRYPT help CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed for Rapid Web Application Development. It diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index 530b44427b..357909f31d 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 = pcre libgcrypt +CPPCMS_DEPENDENCIES = pcre 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_LIBGCRYPT),y) +CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=OFF +CPPCMS_DEPENDENCIES += libgcrypt +else +CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=ON +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF CPPCMS_DEPENDENCIES += zlib