summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-01-13 20:17:01 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-14 20:27:53 +0100
commit5222d956a6463ebf6705d70e2ee3a36c70e3a8ea (patch)
tree88b82d7440840c0e5d6018bd06a4023a09898fe5
parent435ae1e2b5f9437f6a1f85a232e8ef0d009bf36a (diff)
rsyslog: bump to version 8.7.0
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/rsyslog/Config.in5
-rw-r--r--package/rsyslog/rsyslog.hash4
-rw-r--r--package/rsyslog/rsyslog.mk8
3 files changed, 8 insertions, 9 deletions
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 1f94104e3..d66132f37 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -6,11 +6,12 @@ config BR2_PACKAGE_RSYSLOG
select BR2_PACKAGE_JSON_C
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
+ depends on !BR2_STATIC_LIBS # modules
help
Rsyslog is a powerful and flexible syslog implementation
http://www.rsyslog.com
-comment "rsyslog needs a toolchain w/ threads"
+comment "rsyslog needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash
index ed51326dd..4a0ae5aa1 100644
--- a/package/rsyslog/rsyslog.hash
+++ b/package/rsyslog/rsyslog.hash
@@ -1,2 +1,2 @@
-# From http://www.rsyslog.com/downloads/download-v7-stable/
-sha256 fc29d2d9cbf3396091dd0bab2eb6f847aed4a44ef73138a97ddf9447446125ee rsyslog-7.6.7.tar.gz
+# From http://www.rsyslog.com/downloads/download-v8-stable/
+sha256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c rsyslog-8.7.0.tar.gz
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 27a72da54..fb5249c04 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -4,15 +4,13 @@
#
################################################################################
-RSYSLOG_VERSION = 7.6.7
+RSYSLOG_VERSION = 8.7.0
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf
-
-RSYSLOG_CONF_OPTS = --disable-testbench \
- --enable-cached-man-pages \
- --disable-generate-man-pages
+RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
+RSYSLOG_CONF_OPTS = --disable-generate-man-pages
# Build after BusyBox
ifeq ($(BR2_PACKAGE_BUSYBOX),y)