Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled
Date: Mon, 4 Nov 2019 21:43:13 +0100	[thread overview]
Message-ID: <20191104214313.58527eb2@windsurf.home> (raw)
In-Reply-To: <20191104203052.52584-1-matthew.weber@rockwellcollins.com>

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

  reply	other threads:[~2019-11-04 20:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-04 20:30 [Buildroot] [PATCH] package/libcurl: enable options when libcurl is enabled Matt Weber
2019-11-04 20:43 ` Thomas Petazzoni [this message]
2019-11-04 21:11   ` Thomas Petazzoni
2019-11-04 21:12     ` Matthew Weber

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=20191104214313.58527eb2@windsurf.home \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox