aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-02-18 12:44:33 +0100
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-02-20 23:26:04 +0100
commit2fb86873db4deaa49ac3c247d753a759568cf4a5 (patch)
treecca9e6a2eef3c94db94d6dd9964b34f92f4797bf
parent77c057939ddb669a65f4f10d9e927ad958d516cb (diff)
downloadbuildroot-2fb86873db4deaa49ac3c247d753a759568cf4a5.tar.gz
buildroot-2fb86873db4deaa49ac3c247d753a759568cf4a5.tar.bz2
package/syslog-ng: add optional rabbitmq-c dependency
rabbitmq-c is not an embedded submodule since version 3.16.1 and https://github.com/balabit/syslog-ng/commit/c0559593c377f04662368dbecf282d2670aad12f So enable/disable amqp depending on rabbitmq-c availability and remove uneeded -lrt from LIBS Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Fabrice Fontaine &lt;<a href="mailto:fontaine.fabrice@gmail.com" target="_blank" rel="noreferrer">fontaine.fabrice@gmail.com</a>&gt;<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Looks good to me</div><div dir="auto"><br></div><div dir="auto">Reviewed-by: Chris Packham &lt;<a href="mailto:judge.packham@gmail.com">judge.packham@gmail.com</a>&gt;<br><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/syslog-ng/syslog-ng.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 0c92b091b4..4ac25a675b 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -14,8 +14,6 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
eventlog libglib2 openssl pcre
# We're patching configure.ac
SYSLOG_NG_AUTORECONF = YES
-# rabbit-mq needs -lrt
-SYSLOG_NG_CONF_ENV = LIBS=-lrt
SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
--disable-java --disable-java-modules --disable-mongodb
@@ -83,6 +81,13 @@ else
SYSLOG_NG_CONF_OPTS += --disable-http
endif
+ifeq ($(BR2_PACKAGE_RABBITMQ_C),y)
+SYSLOG_NG_DEPENDENCIES += rabbitmq-c
+SYSLOG_NG_CONF_OPTS += --enable-amqp
+else
+SYSLOG_NG_CONF_OPTS += --disable-amqp
+endif
+
ifeq ($(BR2_INIT_SYSTEMD),y)
SYSLOG_NG_DEPENDENCIES += systemd
SYSLOG_NG_CONF_OPTS += \