From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt is optional, not mandatory
Date: Sun, 3 Apr 2022 17:46:10 +0200 [thread overview]
Message-ID: <20220403154612.4158174-2-fontaine.fabrice@gmail.com> (raw)
In-Reply-To: <20220403154612.4158174-1-fontaine.fabrice@gmail.com>
If libgcrypt (or openssl) is not enabled, aes_encryptor is disabled
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-04-03 15:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
2022-04-03 15:46 ` Fabrice Fontaine [this message]
2022-04-04 19:21 ` [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt " Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 3/4] package/cppcms: add openssl optional dependency Fabrice Fontaine
2022-04-04 19:22 ` Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2 Fabrice Fontaine
2022-04-03 19:05 ` Yann E. MORIN
2022-04-04 19:21 ` [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220403154612.4158174-2-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.