aboutsummaryrefslogtreecommitdiff
path: root/package/ulogd
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2013-12-26 08:34:42 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-26 18:44:57 +0100
commit1f226a2e382938abdf886218adb46e399f465c92 (patch)
treec19eac56fab54b634d3f42d81dad95b49e7977b8 /package/ulogd
parent3bb18ae95e515c2edfbe990346ec9bb3319c7753 (diff)
downloadbuildroot-1f226a2e382938abdf886218adb46e399f465c92.tar.gz
buildroot-1f226a2e382938abdf886218adb46e399f465c92.tar.bz2
ulogd: disable DB backends if no threads
Database backends need threads even if sqlite does not. The mysql client libs need them too but include them in the exclusion closure anyway to state it very clearly. Fixes: http://autobuild.buildroot.net/results/1ce/1cece0db309dfe5cecc69e88b02428615ed87316/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ulogd')
-rw-r--r--package/ulogd/ulogd.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 24a583884c..03958bbc39 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -11,15 +11,21 @@ ULOGD_CONF_OPT = --with-dbi=no --with-pgsql=no
ULOGD_AUTORECONF = YES
ULOGD_DEPENDENCIES = host-pkgconf \
libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
- libnfnetlink $(if $(BR2_PACKAGE_SQLITE),sqlite)
+ libnfnetlink
ULOGD_LICENSE = GPLv2
ULOGD_LICENSE_FILES = COPYING
+# DB backends need threads
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
-ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
-ULOGD_DEPENDENCIES += mysql_client
+ ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
+ ULOGD_DEPENDENCIES += mysql_client
+endif
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+ ULOGD_DEPENDENCIES += sqlite
+endif
else
-ULOGD_CONF_OPT += --with-mysql=no
+ ULOGD_CONF_OPT += --with-mysql=no --without-sqlite
endif
$(eval $(autotools-package))