NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsyslog: libuuid is an optional dependency, not a required one

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2014-10-01 14:51:51 +02:00
parent 37d41013f8
commit d89a2610cf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/rsyslog/Config.in
View File

@ -4,12 +4,8 @@ config BR2_PACKAGE_RSYSLOG
select BR2_PACKAGE_LIBESTR select BR2_PACKAGE_LIBESTR
select BR2_PACKAGE_LIBLOGGING select BR2_PACKAGE_LIBLOGGING
select BR2_PACKAGE_JSON_C select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_LARGEFILE # util-linux
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # util-linux
help help
Rsyslog is a powerful and flexible syslog implementation Rsyslog is a powerful and flexible syslog implementation

9
package/rsyslog/rsyslog.mk
View File

@ -8,7 +8,7 @@ RSYSLOG_VERSION = 7.6.5
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0 RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c util-linux host-pkgconf RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf
RSYSLOG_CONF_OPT = --disable-testbench \ RSYSLOG_CONF_OPT = --disable-testbench \
--enable-cached-man-pages --enable-cached-man-pages
@ -30,6 +30,13 @@ else
RSYSLOG_CONF_OPT += --enable-libgcrypt=no RSYSLOG_CONF_OPT += --enable-libgcrypt=no
endif endif
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
RSYSLOG_DEPENDENCIES += util-linux
RSYSLOG_CONF_OPT += --enable-uuid
else
RSYSLOG_CONF_OPT += --disable-uuid
endif
define RSYSLOG_INSTALL_INIT_SYSV define RSYSLOG_INSTALL_INIT_SYSV
[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \ [ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \ $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \