From patchwork Tue Dec 17 01:16:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 301955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 8BD882C007B for ; Tue, 17 Dec 2013 12:20:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A76178B96C; Tue, 17 Dec 2013 01:20:04 +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 a5vM9b8oK+8N; Tue, 17 Dec 2013 01:20:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8467C8BB6B; Tue, 17 Dec 2013 01:20: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 36D991BFA82 for ; Tue, 17 Dec 2013 01:20:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 342AE935B1 for ; Tue, 17 Dec 2013 01:20:02 +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 gcXQtL+55+XG for ; Tue, 17 Dec 2013 01:20:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5208E9352F for ; Tue, 17 Dec 2013 01:20:01 +0000 (UTC) Received: from acaen-252-1-215-135.w86-215.abo.wanadoo.fr ([86.215.59.135] helo=debian.home) by marvin.crapouillou.net with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1VsjGu-0002I9-J1; Tue, 17 Dec 2013 02:16:28 +0100 From: Paul Cercueil To: buildroot@busybox.net Date: Tue, 17 Dec 2013 02:16:15 +0100 Message-Id: <1387242975-5074-1-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 1.8.5.1 Cc: Paul Cercueil Subject: [Buildroot] [PATCH] nodejs: Bump to version 0.10.12 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 This makes building on mipsel possible (hard-float variant only). Signed-Off-By: Paul Cercueil --- package/nodejs/Config.in | 3 ++- package/nodejs/nodejs-v8-gregs-fix.patch | 29 ----------------------------- package/nodejs/nodejs.mk | 4 +++- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 package/nodejs/nodejs-v8-gregs-fix.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 0258460..7c08f83 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -4,7 +4,8 @@ config BR2_PACKAGE_NODEJS depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_arm || BR2_i386 || BR2_x86_64 + 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_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526) # uses fork() diff --git a/package/nodejs/nodejs-v8-gregs-fix.patch b/package/nodejs/nodejs-v8-gregs-fix.patch deleted file mode 100644 index 4af33bc..0000000 --- a/package/nodejs/nodejs-v8-gregs-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix compilation for ARM/uClibc -Patch from Remi Duraffort , taken from -https://code.google.com/p/v8/source/detail?r=12094 - -Signed-off-by: Daniel Price - ---- a/deps/v8/src/platform-linux.cc -+++ b/deps/v8/src/platform-linux.cc -@@ -1025,7 +1025,8 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { - sample->fp = reinterpret_cast
(mcontext.gregs[REG_RBP]); - #elif V8_HOST_ARCH_ARM - // An undefined macro evaluates to 0, so this applies to Android's Bionic also. --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ -+ !defined(__UCLIBC__)) - sample->pc = reinterpret_cast
(mcontext.gregs[R15]); - sample->sp = reinterpret_cast
(mcontext.gregs[R13]); - sample->fp = reinterpret_cast
(mcontext.gregs[R11]); -@@ -1033,7 +1034,8 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { - sample->pc = reinterpret_cast
(mcontext.arm_pc); - sample->sp = reinterpret_cast
(mcontext.arm_sp); - sample->fp = reinterpret_cast
(mcontext.arm_fp); --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && -+ // !defined(__UCLIBC__)) - #elif V8_HOST_ARCH_MIPS - sample->pc = reinterpret_cast
(mcontext.pc); - sample->sp = reinterpret_cast
(mcontext.gregs[29]); - diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 874c5f1..a44bfbd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 0.8.22 +NODEJS_VERSION = 0.10.12 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs \ @@ -43,6 +43,8 @@ ifeq ($(BR2_i386),y) NODEJS_CPU=ia32 else ifeq ($(BR2_x86_64),y) NODEJS_CPU=x64 +else ifeq ($(BR2_mipsel),y) +NODEJS_CPU=mipsel else ifeq ($(BR2_arm),y) NODEJS_CPU=arm # V8 needs to know what floating point ABI the target is using. There's also