From 7bf8aed70c12aa785294f4b6d767873a5f4b38a9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Aug 2022 14:36:52 +0200 Subject: [PATCH] package/rsyslog: imhttp support needs apr-util imhttp support needs apr-util in addition to civetweb since bump to version 8.2204.1 in commit bc469ee6329555284b2fe9162597917122fbbe3a and https://github.com/rsyslog/rsyslog/commit/a8b8d6c1f969286adac3d465e6ac018968550667. Without apr-util, the build fails with: configure: error: Package requirements (apr-util-1 >= 1.0) were not met: Package 'apr-util-1', required by 'virtual:world', not found Instead of having the user needing to figure out that apr-util is needed for imhttp support, have the top-level rsyslog option selects apr-util when civetweb-lib is enabled Fixes: - http://autobuild.buildroot.org/results/4454ae5321df0c04c9dee19693f3908e69fbf23d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsyslog/Config.in | 1 + package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 8c024e69c7..3ba326191a 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_RSYSLOG # even though rsyslog already depends on threads for itself: depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_APR_UTIL if BR2_PACKAGE_CIVETWEB_LIB select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBESTR select BR2_PACKAGE_LIBLOGGING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 1788d29281..a6e32ecea1 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -53,7 +53,7 @@ RSYSLOG_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) -RSYSLOG_DEPENDENCIES += civetweb +RSYSLOG_DEPENDENCIES += apr-util civetweb RSYSLOG_CONF_OPTS += --enable-imhttp else RSYSLOG_CONF_OPTS += --disable-imhttp