[Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled

[Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled

[Matt Weber]

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 <matthew.weber@rockwellcollins.com>
---
 package/rsyslog/rsyslog.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 5bd6b59ba3..e3a634a868 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -17,7 +17,7 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
 RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
 
-# Disable items requiring libcurl
+ifeq ($(BR2_PACKAGE_LIBCURL),)
 RSYSLOG_CONF_OPTS += --disable-elasticsearch \
 	--disable-clickhouse \
 	--disable-omhttp \
@@ -25,6 +25,9 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \
 	--disable-imdocker \
 	--disable-omhttpfs \
 	--disable-mmkubernetes
+else
+RSYSLOG_DEPENDENCIES += libcurl
+endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RSYSLOG_DEPENDENCIES += gnutls
-- 
2.17.1

[Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled

[Thomas Petazzoni]

On Mon,  4 Nov 2019 14:30:52 -0600
Matt Weber <matthew.weber@rockwellcollins.com> wrote:

> 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 <matthew.weber@rockwellcollins.com>
> ---
>  package/rsyslog/rsyslog.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index 5bd6b59ba3..e3a634a868 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -17,7 +17,7 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
>  RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
>  	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
>  
> -# Disable items requiring libcurl
> +ifeq ($(BR2_PACKAGE_LIBCURL),)
>  RSYSLOG_CONF_OPTS += --disable-elasticsearch \
>  	--disable-clickhouse \
>  	--disable-omhttp \
> @@ -25,6 +25,9 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \
>  	--disable-imdocker \
>  	--disable-omhttpfs \
>  	--disable-mmkubernetes
> +else
> +RSYSLOG_DEPENDENCIES += libcurl
> +endif

We really prefer to use positive logic, and explicitly enable the
options as well:

ifeq ($(BR2_PACKAGE_LIBCURL),y)
RSYSLOG_CONF_OPTS += --enable-foo --enable-bar
RSYSLOG_DEPENDENCIES += libcurl
else
RSYSLOG_CONF_OPTS += --disable-foo --disable-bar
endif

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled

[Thomas Petazzoni]

Hello,

On Mon, 4 Nov 2019 21:43:13 +0100
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:

> We really prefer to use positive logic, and explicitly enable the
> options as well:

Also, in the commit title: package/libcurl should be package/rsyslog.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled

[Matthew Weber]

On Mon, Nov 4, 2019 at 3:11 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello,
>
> On Mon, 4 Nov 2019 21:43:13 +0100
> Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
>
> > We really prefer to use positive logic, and explicitly enable the
> > options as well:
>
> Also, in the commit title: package/libcurl should be package/rsyslog.
>
Yep just noticed that :-)   v2 sent.