Skip to contentSkip to conversation

package/libcurl: enable options when libcurl is enabled

PATCH Superseded Matt Weber 2 participants 4 messages Nov 4, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/1 package/libcurl: 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.

---
 package/rsyslog/rsyslog.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/rsyslog/rsyslog.mk +4 -1
index 5bd6b59ba3..e3a634a868 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/libcurl: enable options when libcurl is enabled

Quoted 24 lines · On Mon, 4 Nov 2019 14:30:52 -0600 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.

---
 package/rsyslog/rsyslog.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/rsyslog/rsyslog.mk +1 -1
index 5bd6b59ba3..e3a634a868 100644
@@ -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 \

package/rsyslog/rsyslog.mk RSYSLOG_CONF_OPTS += --disable-elasticsearch \ · line 30

Quoted 6 lines
package/rsyslog/rsyslog.mk +3 -0
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/libcurl: enable options when libcurl is enabled

Hello,

Quoted 2 lines · On Mon, 4 Nov 2019 21:43:13 +0100 Thomas Petazzoni…

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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/libcurl: enable options when libcurl is enabled

Quoted 11 lines · Thomas Petazzoni

Hello,

Quoted 2 lines · On Mon, 4 Nov 2019 21:43:13 +0100 Thomas Petazzoni…

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.