* [Buildroot] [PATCH 1/1] package/collectd: add lua optional dependency
@ 2019-10-28 15:29 Fabrice Fontaine
2019-10-29 23:29 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2019-10-28 15:29 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/collectd/collectd.mk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 50425e89ac..820547b511 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -18,7 +18,7 @@ COLLECTD_AUTORECONF = YES
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
- gmond hddtemp intel_rdt ipmi java lpar lua \
+ gmond hddtemp intel_rdt ipmi java lpar \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
@@ -213,6 +213,13 @@ else
COLLECTD_CONF_OPTS += --with-libgcrypt=no
endif
+ifeq ($(BR2_PACKAGE_LUA),y)
+COLLECTD_DEPENDENCIES += lua
+COLLECTD_CONF_OPTS += --enable-lua
+else
+COLLECTD_CONF_OPTS += --disable-lua
+endif
+
define COLLECTD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
rm -f $(TARGET_DIR)/usr/bin/collectd-nagios
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/collectd: add lua optional dependency
2019-10-28 15:29 [Buildroot] [PATCH 1/1] package/collectd: add lua optional dependency Fabrice Fontaine
@ 2019-10-29 23:29 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2019-10-29 23:29 UTC (permalink / raw)
To: buildroot
On 28/10/2019 16:29, Fabrice Fontaine wrote:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/collectd/collectd.mk | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index 50425e89ac..820547b511 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -18,7 +18,7 @@ COLLECTD_AUTORECONF = YES
> # These require unmet dependencies, are fringe, pointless or deprecated
So the lua plugin is not fringe, pointless or deprecated?
I'll take your word for it :-)
Applied to master, thanks.
Regards,
Arnout
> COLLECTD_PLUGINS_DISABLE = \
> apple_sensors aquaero ascent barometer dbi dpdkstat email \
> - gmond hddtemp intel_rdt ipmi java lpar lua \
> + gmond hddtemp intel_rdt ipmi java lpar \
> madwifi mbmon mic multimeter netapp notify_desktop numa \
> nut oracle perl pf pinba powerdns python routeros \
> rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
> @@ -213,6 +213,13 @@ else
> COLLECTD_CONF_OPTS += --with-libgcrypt=no
> endif
>
> +ifeq ($(BR2_PACKAGE_LUA),y)
> +COLLECTD_DEPENDENCIES += lua
> +COLLECTD_CONF_OPTS += --enable-lua
> +else
> +COLLECTD_CONF_OPTS += --disable-lua
> +endif
> +
> define COLLECTD_INSTALL_TARGET_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
> rm -f $(TARGET_DIR)/usr/bin/collectd-nagios
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-29 23:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-28 15:29 [Buildroot] [PATCH 1/1] package/collectd: add lua optional dependency Fabrice Fontaine
2019-10-29 23:29 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.