* [Buildroot] [git commit branch/2020.02.x] package/sconeserver: pcre is optional, not mandatory
@ 2021-03-21 18:55 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2021-03-21 18:55 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=c38a30371d1ed6a199fafcf2d8a2fa8181056f17
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x
pcre is optional not mandatory since
https://github.com/sconemad/sconeserver/commit/98ec61436c9ea68ffe2d70a818c1175dcafa2a79
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 754633fe8c306190c00087662df42f5b740c8754)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/sconeserver/Config.in | 1 -
package/sconeserver/sconeserver.mk | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index 09cf5d459c..429ac81fe1 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -3,7 +3,6 @@ menuconfig BR2_PACKAGE_SCONESERVER
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen()
- select BR2_PACKAGE_PCRE
select BR2_PACKAGE_ZLIB
help
Sconeserver is a modular, object-orientated and extremely
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index b81134002e..62cc128d77 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -10,7 +10,10 @@ SCONESERVER_LICENSE = GPL-2.0+
SCONESERVER_LICENSE_FILES = COPYING
# fetching from Git, we need to generate the configure script
SCONESERVER_AUTORECONF = YES
-SCONESERVER_DEPENDENCIES = host-pkgconf pcre zlib
+SCONESERVER_DEPENDENCIES = \
+ host-pkgconf \
+ $(if $(BR2_PACKAGE_PCRE),pcre) \
+ zlib
# disable markdown module because its git submodule cmark
# https://github.com/sconemad/sconeserver/tree/master/markdown
# has no cross-compile support provided by the sconeserver build system
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-21 18:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-21 18:55 [Buildroot] [git commit branch/2020.02.x] package/sconeserver: pcre is optional, not mandatory 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.