From patchwork Wed Jul 18 07:50:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 171607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 697FC2C0351 for ; Wed, 18 Jul 2012 17:50:37 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1A0FDA04A0; Wed, 18 Jul 2012 07:50:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VQKflWYxmJbH; Wed, 18 Jul 2012 07:50:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 08953A0496; Wed, 18 Jul 2012 07:50:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B88978F75B for ; Wed, 18 Jul 2012 07:50:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A019B10B8CD for ; Wed, 18 Jul 2012 07:50:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6-XM5vO8R++N for ; Wed, 18 Jul 2012 07:50:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BFD710B8B8 for ; Wed, 18 Jul 2012 07:50:27 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 484791E9; Wed, 18 Jul 2012 09:50:27 +0200 (CEST) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 565EB131 for ; Wed, 18 Jul 2012 09:50:17 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Wed, 18 Jul 2012 09:50:15 +0200 Message-Id: <1342597816-16767-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] sqlite: do not assume thread support is available 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 The --enable-threadsafe option was unconditionally passed, without taking into account whether the underlying toolchain had thread support or not. Now, we properly pass --enable-threadsafe or --disable-threadsafe depending on the availability of thread support. Fixes http://autobuild.buildroot.net/results/defdc098cff293baabf2f89587476eba71f1c0d0/build-end.log. Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 5b85ecc..9e63b52 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -23,9 +23,14 @@ endif SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" SQLITE_CONF_OPT = \ - --enable-threadsafe \ --localstatedir=/var +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +SQLITE_CONF_OPT += --enable-threadsafe +else +SQLITE_CONF_OPT += --disable-threadsafe +endif + ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y) SQLITE_DEPENDENCIES += ncurses readline SQLITE_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"