Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 3 years ago
parent
d8f540bef0
commit
7bf8aed70c
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 0
      package/rsyslog/Config.in
  2. 1 1
      package/rsyslog/rsyslog.mk

+ 1 - 0
package/rsyslog/Config.in
View File 

@@ -8,6 +8,7 @@ config BR2_PACKAGE_RSYSLOG
 
 	# even though rsyslog already depends on threads for itself:
 
 	# even though rsyslog already depends on threads for itself:
 
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS
 
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS
 
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 
+	select BR2_PACKAGE_APR_UTIL if BR2_PACKAGE_CIVETWEB_LIB
 
 	select BR2_PACKAGE_ZLIB
 
 	select BR2_PACKAGE_ZLIB
 
 	select BR2_PACKAGE_LIBESTR
 
 	select BR2_PACKAGE_LIBESTR
 
 	select BR2_PACKAGE_LIBLOGGING
 
 	select BR2_PACKAGE_LIBLOGGING

+ 1 - 1
package/rsyslog/rsyslog.mk
View File 

@@ -53,7 +53,7 @@ RSYSLOG_CONF_OPTS += \
 
 endif
 
 endif
 
 
 
 ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
 
 ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
 
-RSYSLOG_DEPENDENCIES += civetweb
 
+RSYSLOG_DEPENDENCIES += apr-util civetweb
 
 RSYSLOG_CONF_OPTS += --enable-imhttp
 
 RSYSLOG_CONF_OPTS += --enable-imhttp
 
 else
 
 else
 
 RSYSLOG_CONF_OPTS += --disable-imhttp
 
 RSYSLOG_CONF_OPTS += --disable-imhttp