From patchwork Thu Dec 17 23:20:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Bark X-Patchwork-Id: 558682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 15BED14029E for ; Fri, 18 Dec 2015 10:21:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=barkynet-com.20150623.gappssmtp.com header.i=@barkynet-com.20150623.gappssmtp.com header.b=CEbbh6cp; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3FCAF92EB6; Thu, 17 Dec 2015 23:21:02 +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 yBYTrntMWxq1; Thu, 17 Dec 2015 23:20:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8439292E83; Thu, 17 Dec 2015 23:20:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 58D931C0B7A for ; Thu, 17 Dec 2015 23:20:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5324692E4B for ; Thu, 17 Dec 2015 23:20:50 +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 On8Co+YyaCsu for ; Thu, 17 Dec 2015 23:20:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id AA33492BB2 for ; Thu, 17 Dec 2015 23:20:48 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id p187so42471630wmp.0 for ; Thu, 17 Dec 2015 15:20:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=barkynet-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=OTQSWv0A6vVSMZwQbKomvS/eINxJa+oNWKIhocea/PI=; b=CEbbh6cp3noBurX8mdz46wHDIuTlE6DKbQGpay6NBNcr4CnPiDMtgJ4m+y9zYw6M2v 4uGqJ7YTCipMKSVWV3Zk1p9dStQBzo/NEjmE3/IKoM7BvXY1lrzFQTkVOIjAPlIDbhVl 08kLIgVFN7YpYZkhKJ6SYhLCSMaFrJDPdvTNHryWSmaVEoU5GabFU95vekcpNYWe/LW6 sOrTLvLmuEbeeY69V8EYClBowwxkllpx4PAy+TOp3bkyCvBFCyH5sJyB5PwDYK+2sLa/ CQoV7L/tQu2ucZpt3xrudEI5nDvjhEH+Y2f/B9dTcsnAOsUrl4529jL2IWqlHaqdEBMF XRkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; bh=OTQSWv0A6vVSMZwQbKomvS/eINxJa+oNWKIhocea/PI=; b=RkCj3zAf940dNQMA3RJgIOcithU18EWKlxRHVXPN713XMZekRfsPH5FDtBuOtHfrm/ 06WwbDksAEGLEPook5aR6kGbfRug3XiXbMIfk16vFooRgFW72rtPK5opMQXqXgPV2Jf9 CoPxdZCU1txtlgXI4mzq0AiAxELntEtROjFHkap1gy6kx858eg2Hxq094/HzWe92t282 1YzZVN+w5xM73+6l6ORIZLp97HabJFVuecBtsFjq7fIw7Dr2Dy4xqWHzg6XNEm7448wl NR622Y0kob6bIkGNxD47PnifIlkgK4CIYqGgSuznd+YYgCS3/ujNZ3UYD3nCbs7MixWN FDDg== X-Gm-Message-State: ALoCoQnZkxaF/tmaQpvKGJLK8WFIZf5kvoyKoHrIbZrHhTGTnZbiOBWZM+XbRRXDVhuePT52StQJKPH3R5s2oyLIU5Evm+tqwg== X-Received: by 10.194.79.8 with SMTP id f8mr414141wjx.6.1450394447245; Thu, 17 Dec 2015 15:20:47 -0800 (PST) Received: from mail.home.barkynet.com (barkynet.plus.com. [80.229.219.126]) by smtp.gmail.com with ESMTPSA id b84sm4259572wmh.15.2015.12.17.15.20.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Dec 2015 15:20:45 -0800 (PST) Received: from krusty (krusty.home.barkynet.com [192.168.1.10]) by mail.home.barkynet.com (Postfix) with ESMTP id 865271E7BD; Thu, 17 Dec 2015 23:20:42 +0000 (GMT) Received: by krusty (Postfix, from userid 10000) id 969C36C01D6; Thu, 17 Dec 2015 23:20:40 +0000 (GMT) From: Martin Bark To: buildroot@buildroot.org Date: Thu, 17 Dec 2015 23:20:22 +0000 Message-Id: <1450394426-3349-1-git-send-email-martin@barkynet.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/5] package/nodejs: bump version to 5.3.0 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" Replace 4.2.3 with 5.3.0. 5.3.0 is the current Stable release. See https://nodejs.org/en/blog/release/v5.3.0 for details on the release. Copied 4.2.3 patched to 5.3.0 with the following exceptions: - Removed 0004-fix-arm-vfpv2.patch, committed upstream and included in 5.3.0. See https://github.com/nodejs/node/commit/84dea1bd0c - Added 0004-Fix-va_list-not-declared.patch, fix for a new bug. This has already been fixed upstream but is not in 5.3.0 Signed-off-by: Martin Bark --- Changes v1 -> v2 - Updated patch set from 5.2.0 to 5.3.0 --- Config.in.legacy | 9 +++++ package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch | 46 ---------------------- ...01-Remove-dependency-on-Python-bz2-module.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 ...hon-variable-instead-of-hardcoding-Python.patch | 0 .../5.3.0/0004-Fix-va_list-not-declared.patch | 39 ++++++++++++++++++ package/nodejs/Config.in | 12 +++--- package/nodejs/nodejs.hash | 4 +- package/nodejs/nodejs.mk | 2 +- 9 files changed, 58 insertions(+), 54 deletions(-) delete mode 100644 package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch rename package/nodejs/{4.2.3 => 5.3.0}/0001-Remove-dependency-on-Python-bz2-module.patch (100%) rename package/nodejs/{4.2.3 => 5.3.0}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{4.2.3 => 5.3.0}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%) create mode 100644 package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch diff --git a/Config.in.legacy b/Config.in.legacy index e1ea06f..ee67720 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -186,6 +186,15 @@ config BR2_PACKAGE_INFOZIP to avoid ambiguities with Info-Zip's UnZip which has been added in the unzip package. +config BR2_BR2_PACKAGE_NODEJS_4_X + bool "nodejs version 4.x has been removed" + select BR2_LEGACY + select BR2_PACKAGE_NODEJS + help + nodejs version 4.x has been removed. As an alternative, + the latest nodejs version has been automatically selected in + your configuration. + ############################################################################### comment "Legacy options removed in 2015.11" diff --git a/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch b/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch deleted file mode 100644 index 7ff280b..0000000 --- a/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0b07d813adcfdc13ef6a0c56f88b864eb3dc4be9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 8 Dec 2015 21:53:06 +0100 -Subject: [PATCH] configure: fix arm vfpv2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2' [1]. - -Patch status: Sent upstream [2] - -[1] https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html -[2] https://github.com/nodejs/node/pull/4202 - -Signed-off-by: "Yann E. MORIN" -[Jörg Krause: adapt to version 4.2.3] -Signed-off-by: Jörg Krause ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index d4aff36..c783bab 100755 ---- a/configure -+++ b/configure -@@ -30,7 +30,7 @@ valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', - valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 'x32', - 'x64', 'x86') - valid_arm_float_abi = ('soft', 'softfp', 'hard') --valid_arm_fpu = ('vfp', 'vfpv2', 'vfpv3', 'vfpv3-d16', 'neon') -+valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') - valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') - valid_mips_fpu = ('fp32', 'fp64', 'fpxx') - valid_mips_float_abi = ('soft', 'hard') -@@ -622,7 +622,7 @@ def configure_arm(o): - else: - arm_float_abi = 'default' - -- arm_fpu = 'vfpv2' -+ arm_fpu = 'vfp' - - if is_arch_armv7(): - arm_fpu = 'vfpv3' --- -2.6.3 diff --git a/package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/5.3.0/0001-Remove-dependency-on-Python-bz2-module.patch similarity index 100% rename from package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch rename to package/nodejs/5.3.0/0001-Remove-dependency-on-Python-bz2-module.patch diff --git a/package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/5.3.0/0002-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/5.3.0/0002-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch b/package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch similarity index 100% rename from package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch rename to package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch diff --git a/package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch b/package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch new file mode 100644 index 0000000..aec8e12 --- /dev/null +++ b/package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch @@ -0,0 +1,39 @@ +From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Tue, 8 Dec 2015 11:41:08 +0000 +Subject: [PATCH] Fix va_list not declared +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When compiling with uClibc-ng the following error is seen. + +In file included from ../deps/v8/src/log-utils.cc:5:0: +../deps/v8/src/log-utils.h:64:39: error: ‘va_list’ has not been declared + void AppendVA(const char* format, va_list args); + +This patch fixes the issue by adding the missing #include . Note +that this fix has already be included upstream, see +https://github.com/nodejs/node/blob/8a43a3d/deps/v8/src/log-utils.h + +Signed-off-by: Martin Bark +--- + deps/v8/src/log-utils.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/deps/v8/src/log-utils.h b/deps/v8/src/log-utils.h +index 87dab52..6714307 100644 +--- a/deps/v8/src/log-utils.h ++++ b/deps/v8/src/log-utils.h +@@ -5,6 +5,8 @@ + #ifndef V8_LOG_UTILS_H_ + #define V8_LOG_UTILS_H_ + ++#include ++ + #include "src/allocation.h" + #include "src/base/platform/mutex.h" + #include "src/flags.h" +-- +2.5.0 + diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index b0f4f2b..769710c 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -37,7 +37,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS choice prompt "Node.js version" default BR2_BR2_PACKAGE_NODEJS_0_10_X if BR2_ARM_CPU_ARMV5 - default BR2_BR2_PACKAGE_NODEJS_4_X + default BR2_PACKAGE_NODEJS_5_X help Select the version of Node.js you wish to use. @@ -48,14 +48,16 @@ config BR2_BR2_PACKAGE_NODEJS_0_12_X bool "v0.12.9" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS -config BR2_BR2_PACKAGE_NODEJS_4_X - bool "v4.2.3" +config BR2_PACKAGE_NODEJS_5_X + bool "v5.3.0" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_USE_WCHAR -comment "v4.2.3 needs a toolchain w/ gcc >= 4.8" +comment "v5.3.0 needs a toolchain w/ gcc >= 4.8, wchar" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_USE_WCHAR endchoice @@ -63,7 +65,7 @@ config BR2_PACKAGE_NODEJS_VERSION_STRING string default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X default "0.12.9" if BR2_BR2_PACKAGE_NODEJS_0_12_X - default "4.2.3" if BR2_BR2_PACKAGE_NODEJS_4_X + default "5.3.0" if BR2_PACKAGE_NODEJS_5_X menu "Module Selection" diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 7d58a54..c3bdc44 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -4,5 +4,5 @@ sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0 # From upstream URL: http://nodejs.org/dist/v0.12.9/SHASUMS256.txt sha256 35daad301191e5f8dd7e5d2fbb711d081b82d1837d59837b8ee224c256cfe5e4 node-v0.12.9.tar.gz -# From upstream URL: http://nodejs.org/dist/v4.2.3/SHASUMS256.txt -sha256 9e8aef1e47b317575c421c8d10a80e6c319b26969b566d3b84e49e65a92837f4 node-v4.2.3.tar.xz +# From upstream URL: http://nodejs.org/dist/v5.3.0/SHASUMS256.txt +sha256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e node-v5.3.0.tar.xz diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7ede89d..af47b26 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING)) -ifeq ($(BR2_BR2_PACKAGE_NODEJS_4_X),y) +ifeq ($(BR2_PACKAGE_NODEJS_5_X),y) NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz else NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz