From patchwork Thu Dec 26 11:34:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 305233 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id EF57C2C0084 for ; Thu, 26 Dec 2013 22:35:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 179CA32D88; Thu, 26 Dec 2013 11:35:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yLFj2khNOcRz; Thu, 26 Dec 2013 11:34:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AB26932AA4; Thu, 26 Dec 2013 11:34:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D743C1BFA94 for ; Thu, 26 Dec 2013 11:34:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D282C80616 for ; Thu, 26 Dec 2013 11:34:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3dTPEC4xaVHf for ; Thu, 26 Dec 2013 11:34:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5FE068AE08 for ; Thu, 26 Dec 2013 11:34:56 +0000 (UTC) Received: from asgard (host119.190-226-78.telecom.net.ar [190.226.78.119]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id rBQBYmmS028071 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 26 Dec 2013 11:34:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1388057693; bh=FKwU+uP29Ox8WlHmWiH3ecPm4akKRM0MKaieLZQ0jXU=; h=From:To:Cc:Subject:Date; b=HAkBZdxV6vmuwsDVNb8Fi0cSnnqK2jMTdzDYUcONtRvbC0fkeR9b5YszTPUpS9D89 TA5ZMQL95gSIv3fmOBb9EB90L9Dgr8apmHJgayWISv01tnxtSZ5DsxSzn/HHPNsWdV ueJrTE8zMprBtSl/c7xDmIhDYLVTc/pVW2wW3WuY= Received: by asgard (sSMTP sendmail emulation); Thu, 26 Dec 2013 08:34:42 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 26 Dec 2013 08:34:42 -0300 Message-Id: <1388057682-2912-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.3.2 X-Virus-Scanned: clamav-milter 0.98 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] ulogd: disable DB backends if no threads X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- package/ulogd/ulogd.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 24a5838..03958bb 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))