From patchwork Mon Nov 4 21:12:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1189174 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rockwellcollins.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 476QVL2dnxz9s4Y for ; Tue, 5 Nov 2019 08:12:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F2A568A387; Mon, 4 Nov 2019 21:12:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bevRbm7o7x4V; Mon, 4 Nov 2019 21:12:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 45AA88A33F; Mon, 4 Nov 2019 21:12:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B0A601BF29E for ; Mon, 4 Nov 2019 21:12:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ABE318A33E for ; Mon, 4 Nov 2019 21:12:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2rU58mlwHtsS for ; Mon, 4 Nov 2019 21:12:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs04.rockwellcollins.com (da1vs04.rockwellcollins.com [205.175.227.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id B4A998A346 for ; Mon, 4 Nov 2019 21:12:04 +0000 (UTC) IronPort-SDR: 6xUZqY53GyBMsLmu0zxGQYCTnKsXhXbOZI5FtcRo4LKtrV16iREyaoiIwvUwFiF6AL+UGAt4Rw Cnzc+GQpLIAZSPqv+aCNAHA9kQqpB3LpDSgJgnbCrfxdHUUFyCELkkip7OdjMx1THYkpF1fiAn 6xIPGME/mQ85bnzy+QE4Jgh37E/buliyzcTvK/p6NdtwX7VGyima3Asm20whfwExkD8WFmqlqV 2d1CwQJKnhaB8csDvLZFBEVdDYR8mlZsUji57l5WoC06edlnH3o88HcQFN4nPnHEby49IO76YS Ylg= Received: from ofwda1n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs04.rockwellcollins.com with ESMTP; 04 Nov 2019 15:12:04 -0600 X-Received: from biscuits.rockwellcollins.lab (biscuits.rockwellcollins.lab [10.148.119.137]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id D69AA604EB; Mon, 4 Nov 2019 15:12:03 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Mon, 4 Nov 2019 15:12:03 -0600 Message-Id: <20191104211203.52912-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] packagersyslog: enable options when libcurl is enabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- Changes v1 -> v2 [Thomas - Flipped libcurl conditional and name of this patchset to rsyslog --- package/rsyslog/rsyslog.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 5bd6b59ba3..d5a88b19d3 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -17,7 +17,16 @@ 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),y) +RSYSLOG_DEPENDENCIES += libcurl +RSYSLOG_CONF_OPTS += --enable-elasticsearch \ + --enable-clickhouse \ + --enable-omhttp \ + --enable-fmhttp \ + --enable-imdocker \ + --enable-omhttpfs \ + --enable-mmkubernetes +else RSYSLOG_CONF_OPTS += --disable-elasticsearch \ --disable-clickhouse \ --disable-omhttp \ @@ -25,6 +34,7 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \ --disable-imdocker \ --disable-omhttpfs \ --disable-mmkubernetes +endif ifeq ($(BR2_PACKAGE_GNUTLS),y) RSYSLOG_DEPENDENCIES += gnutls