From patchwork Sun Oct 19 20:07:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 400864 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 D3FF614009A for ; Mon, 20 Oct 2014 07:09:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A6EF495338; Sun, 19 Oct 2014 20:09:04 +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 Cph4sr1PFXm4; Sun, 19 Oct 2014 20:09:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C1474953B6; Sun, 19 Oct 2014 20:09:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 47CC61C1E6B for ; Sun, 19 Oct 2014 20:08:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DC526952C3 for ; Sun, 19 Oct 2014 20:08:56 +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 CsKIPCPx7G3N for ; Sun, 19 Oct 2014 20:08:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E99395363 for ; Sun, 19 Oct 2014 20:08:55 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 3BCD93390; Sun, 19 Oct 2014 22:08:58 +0200 (CEST) Received: from localhost (AToulouse-657-1-1059-39.w83-193.abo.wanadoo.fr [83.193.173.39]) by mail.free-electrons.com (Postfix) with ESMTPSA id 01D82ED2; Sun, 19 Oct 2014 22:08:25 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 19 Oct 2014 22:07:46 +0200 Message-Id: <1413749285-1108-13-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1413749285-1108-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1413749285-1108-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 12/31] nodejs: use BR2_ARM_CPU_ARM* options 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adjust the nodejs Config.in dependencies to use the per ARM architecture BR2_ARM_CPU_ARM* options instead of the per ARM core options. Signed-off-by: Thomas Petazzoni --- package/nodejs/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 077a043..cb8fb47 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_NODEJS depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel depends on !BR2_MIPS_SOFT_FLOAT # ARM needs BLX, so v5t+ - depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526) + depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV4T # uses fork() depends on BR2_USE_MMU select BR2_PACKAGE_ZLIB @@ -19,7 +19,7 @@ config BR2_PACKAGE_NODEJS comment "nodejs needs a toolchain w/ C++, IPv6, largefile, threads" depends on BR2_USE_MMU depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel - depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526) + depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV4T depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6