diff mbox series

[2/2] package/rsyslog: add libdbi-drivers optional dependency

Message ID 20231128134301.6018-2-flavio.tapajos@newtesc.com.br
State Superseded
Headers show
Series [1/2] package/rsyslog: bump version to 8.2310.0 | expand

Commit Message

Flávio Tapajós Nov. 28, 2023, 1:43 p.m. UTC
Needed in order to use omlibdbi module

Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
---
 package/rsyslog/Config.in  | 1 +
 package/rsyslog/rsyslog.mk | 7 +++++++
 2 files changed, 8 insertions(+)

Comments

Baruch Siach Nov. 28, 2023, 2:07 p.m. UTC | #1
Hi Flávio,

On Tue, Nov 28 2023, Flávio Tapajós wrote:
> Needed in order to use omlibdbi module
>
> Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br>
> ---
>  package/rsyslog/Config.in  | 1 +
>  package/rsyslog/rsyslog.mk | 7 +++++++
>  2 files changed, 8 insertions(+)
>
> diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
> index 3ba326191a..e07db818e2 100644
> --- a/package/rsyslog/Config.in
> +++ b/package/rsyslog/Config.in
> @@ -13,6 +13,7 @@ config BR2_PACKAGE_RSYSLOG
>  	select BR2_PACKAGE_LIBESTR
>  	select BR2_PACKAGE_LIBLOGGING
>  	select BR2_PACKAGE_LIBFASTJSON
> +	select BR2_PACKAGE_LIBDBI_DRIVERS

The code below indicates that BR2_PACKAGE_LIBDBI_DRIVERS is an optional
dependency. No need to force 'select' in that case. The user can enable
BR2_PACKAGE_LIBDBI_DRIVERS for the omlibdbi functionality.

baruch

>  	help
>  	  Rsyslog is a powerful and flexible syslog implementation
>  
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index cf9f2c0e79..8ea92ea785 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \
>  	--disable-omjournal
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
> +RSYSLOG_CONF_OPTS += --enable-libdbi
> +RSYSLOG_DEPENDENCIES += libdbi-drivers
> +else
> +RSYSLOG_CONF_OPTS += --disable-libdbi
> +endif
> +
>  define RSYSLOG_INSTALL_INIT_SYSTEMD
>  	$(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
>  		$(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service
diff mbox series

Patch

diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 3ba326191a..e07db818e2 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -13,6 +13,7 @@  config BR2_PACKAGE_RSYSLOG
 	select BR2_PACKAGE_LIBESTR
 	select BR2_PACKAGE_LIBLOGGING
 	select BR2_PACKAGE_LIBFASTJSON
+	select BR2_PACKAGE_LIBDBI_DRIVERS
 	help
 	  Rsyslog is a powerful and flexible syslog implementation
 
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index cf9f2c0e79..8ea92ea785 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -151,6 +151,13 @@  RSYSLOG_CONF_OPTS += \
 	--disable-omjournal
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y)
+RSYSLOG_CONF_OPTS += --enable-libdbi
+RSYSLOG_DEPENDENCIES += libdbi-drivers
+else
+RSYSLOG_CONF_OPTS += --disable-libdbi
+endif
+
 define RSYSLOG_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service