From patchwork Sun Jan 18 14:23:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Clouter X-Patchwork-Id: 430214 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 4FA7D1401DA for ; Mon, 19 Jan 2015 01:23:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6C4F1A1C63; Sun, 18 Jan 2015 14:23:26 +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 KMXUoUFU1DIZ; Sun, 18 Jan 2015 14:23:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7F41CA1C64; Sun, 18 Jan 2015 14:23:25 +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 DAAD81C204B for ; Sun, 18 Jan 2015 14:23:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D6E81926A6 for ; Sun, 18 Jan 2015 14:23:23 +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 or83VppIsy3z for ; Sun, 18 Jan 2015 14:23:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marmot.wormnet.eu (marmot.wormnet.eu [188.246.204.87]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5453F927C5 for ; Sun, 18 Jan 2015 14:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=digriz.org.uk; s=wopr; h=Sender:Content-Type:MIME-Version:Message-ID:Subject:To:From:Date; bh=PKBRo8/Z87bHR5NGTRaGWM/qmFr0KH97RCpnVQdSnyo=; b=LQmwHXDGCpH2TcUr6EDTtn0z3VUnWBaOzL3xJs+3LBEI+ahNEDXwSQrXfFsRVFb1s9E0Dx7lkJeNS6c8TITRAFu3KVanAHKR4P9waQBkVHqDu32Tuyc6FzZ3K4DgRSLX4rCsN0AQiqszeMYIDgWIZJityQU7EQR62kijFthyQ+o=; Received: from alex by marmot.wormnet.eu with local (Exim 4.84) (envelope-from ) id 1YCql6-0007zy-84 for buildroot@busybox.net; Sun, 18 Jan 2015 14:23:20 +0000 Date: Sun, 18 Jan 2015 14:23:20 +0000 From: Alexander Clouter To: buildroot@busybox.net Message-ID: <20150118142320.GR27361@marmot> MIME-Version: 1.0 Content-Disposition: inline Organization: diGriz X-URL: http://www.digriz.org.uk/ X-JabberID: alex@digriz.org.uk User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [Buildroot] [PATCH] loosen threads dependency for nftables X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" nftables works fine without threads, only the XML parsing support requires -lpthreads so move the depends into BR2_PACKAGE_LIBNFTNL_XML. Signed-off-by: Alexander Clouter Reviewed-by: "Yann E. MORIN" --- package/libnftnl/Config.in | 10 ++++++---- package/nftables/Config.in | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in index ffd9d5b..af0bb4a 100644 --- a/package/libnftnl/Config.in +++ b/package/libnftnl/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBNFTNL bool "libnftnl" depends on BR2_INET_IPV6 depends on BR2_LARGEFILE - depends on BR2_TOOLCHAIN_HAS_THREADS # bad headers, no sa_family_t in linux/socket.h depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009) select BR2_PACKAGE_LIBMNL @@ -25,12 +24,15 @@ config BR2_PACKAGE_LIBNFTNL_JSON config BR2_PACKAGE_LIBNFTNL_XML bool "enable XML support" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_MXML help Enable XML parsing support +comment "libnftnl XML parsing support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + endif -comment "libnftnl needs a toolchain w/ threads, IPv6, largefile" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \ - !BR2_LARGEFILE +comment "libnftnl needs a toolchain w/ IPv6, largefile" + depends on !BR2_INET_IPV6 || !BR2_LARGEFILE diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 1e0798e..b7af244 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_NFTABLES depends on BR2_INET_IPV6 depends on BR2_LARGEFILE depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 select BR2_PACKAGE_GMP select BR2_PACKAGE_LIBMNL @@ -18,7 +17,6 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html -comment "nftables needs a toolchain w/ IPv6, largefile, threads, wchar, headers >= 3.4" +comment "nftables needs a toolchain w/ IPv6, largefile, wchar, headers >= 3.4" depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4