From e644e5df39c4d63ce7ae28ce2d02bfbf2a230cff Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Mar 2021 14:58:42 +0100 Subject: [PATCH] package/rsyslog: enable options when libcurl is enabled Following the bump to 8.1910.0, items requiring libcurl were disabled by default. This patch selectively enables options which depend on libcurl when that package is enabled in the build. Signed-off-by: Matthew Weber [Fabrice: Disable mmkubernetes which also depends on lognorm and while at it also disable mmnormalize which is available since version 6.1.2 (from 2010) and https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/rsyslog/rsyslog.mk | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 6cf53ccb82..afd1a5557e 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -28,14 +28,29 @@ endif RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) -# Disable items requiring libcurl -RSYSLOG_CONF_OPTS += --disable-elasticsearch \ +# Disable items requiring lognorm +RSYSLOG_CONF_OPTS += \ + --disable-mmkubernetes \ + --disable-mmnormalize + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +RSYSLOG_DEPENDENCIES += libcurl +RSYSLOG_CONF_OPTS += \ + --enable-clickhouse \ + --enable-elasticsearch \ + --enable-fmhttp \ + --enable-imdocker \ + --enable-omhttp \ + --enable-omhttpfs +else +RSYSLOG_CONF_OPTS += \ --disable-clickhouse \ - --disable-omhttp \ + --disable-elasticsearch \ --disable-fmhttp \ --disable-imdocker \ - --disable-omhttpfs \ - --disable-mmkubernetes + --disable-omhttp \ + --disable-omhttpfs +endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) RSYSLOG_DEPENDENCIES += civetweb