[Buildroot] [PATCH 1/2] package/syslog-ng: add optional rabbitmq-c dependency

Arnout Vandecappelle arnout at mind.be
Wed Feb 20 22:27:39 UTC 2019



On 18/02/2019 12:44, Fabrice Fontaine wrote:
> 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


 Applied to master, thanks.

 Indeed, since the recent bump to 3.19.1, we "randomly" build with/without amqp
depending on whether rabbitmq-c was built before or not.

 Regards,
 Arnout


> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  package/syslog-ng/syslog-ng.mk | 9 +++++++--
>  1 file 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 += \
> 


More information about the buildroot mailing list