package/nodejs: bump version to 5.3.0

PATCH Superseded Martin Bark 3 participants 13 messages Dec 17, 2015 – Dec 20, 2015

Share & tools

Martin Bark

author

2015-12-17 23:20 UTC #0 lore raw

PATCH v2 1/5 package/nodejs: bump version to 5.3.0

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 <[email protected]>

---
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

Config.in.legacy +9 -0

index e1ea06f..ee67720 100644
@@ -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"

package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch deleted +0 ~~-46~~

46 lines not on this page · raw message

package/nodejs/5.3.0/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0

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

package/nodejs/5.3.0/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch +0 -0

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

package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0

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

package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch new file +39 -0

new file mode 100644
index 0000000..aec8e12
@@ -0,0 +1,39 @@
+From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001
+From: Martin Bark <[email protected]>
+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 <cstdarg>.  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 <[email protected]>
+---
+ 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 <cstdarg>
++
+ #include "src/allocation.h"
+ #include "src/base/platform/mutex.h"
+ #include "src/flags.h"
+-- 
+2.5.0
+

package/nodejs/Config.in +7 -5

index b0f4f2b..769710c 100644
@@ -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"

package/nodejs/nodejs.hash +2 -2

index 7d58a54..c3bdc44 100644
@@ -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

package/nodejs/nodejs.mk +1 -1

index 7ede89d..af47b26 100644
@@ -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

Signature · 1 line

2.5.0

Martin Bark

author

2015-12-17 23:20 UTC #1 lore raw

PATCH v2 2/5 package/nodejs: removed version 0.12.9

Remove 0.12.9 to rationalise the number of nodejs releases supported by buildroot. Going forward buildroot will only support the latest release of nodejs and the 0.10.x branch for armv5 support.

Signed-off-by Martin Bark <[email protected]>

---
Changes v1 -> v2
- New in v2

---
 Config.in.legacy                                   |  9 ++++
 ...01-Remove-dependency-on-Python-bz2-module.patch | 39 --------------
 .../0002-gyp-force-link-command-to-use-CXX.patch   | 27 ----------
 ...hon-variable-instead-of-hardcoding-Python.patch | 63 ----------------------
 ...c-fix-build-error-without-OpenSSL-support.patch | 44 ---------------
 ...or-arm-predefined-macro-in-atomicops_inte.patch | 30 -----------
 package/nodejs/Config.in                           |  5 --
 package/nodejs/nodejs.hash                         |  3 --
 8 files changed, 9 insertions(+), 211 deletions(-)
 delete mode 100644 package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch
 delete mode 100644 package/nodejs/0.12.9/0002-gyp-force-link-command-to-use-CXX.patch
 delete mode 100644 package/nodejs/0.12.9/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
 delete mode 100644 package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch
 delete mode 100644 package/nodejs/0.12.9/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch

Config.in.legacy +9 -0

index ee67720..db1eeae 100644
@@ -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_0_12_X
+	bool "nodejs version 0.12.x has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NODEJS
+	help
+	  nodejs version 0.12.x has been removed.  As an alternative,
+	  the latest nodejs version has been automatically selected in
+	  your configuration.
+
 config BR2_BR2_PACKAGE_NODEJS_4_X
 	bool "nodejs version 4.x has been removed"
 	select BR2_LEGACY

package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch deleted +0 ~~-39~~

deleted file mode 100644
index 24a78a4..0000000
@@ -1,39 +0,0 @@
-From 3d4817c152d6f3afddcc699949c4d1664da91e2b Mon Sep 17 00:00:00 2001
-From: Martin Bark <[email protected]>
-Date: Tue, 30 Jun 2015 09:43:11 +0100
-Subject: [PATCH 1/4] Remove dependency on Python bz2 module
-
-The Python bz2 module is only needed in certain cases, so only import
-it when needed. In the normal nodejs build, this allows to remove the
-dependency on this module.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Martin: adapt to 0.12.5]
-Signed-off-by: Martin Bark <[email protected]>
----
- deps/v8/tools/js2c.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/v8/tools/js2c.py b/deps/v8/tools/js2c.py
-index 77485f6..371caf5 100755
---- a/deps/v8/tools/js2c.py
-+++ b/deps/v8/tools/js2c.py
-@@ -34,7 +34,6 @@
- import os, re, sys, string
- import optparse
- import jsmin
--import bz2
- import textwrap
- 
- 
-@@ -492,6 +491,7 @@ def CompressMaybe(sources, compression_type):
-   if compression_type == "off":
-     return sources_bytes
-   elif compression_type == "bz2":
-+    import bz2
-     return bz2.compress(sources_bytes)
-   else:
-     raise Error("Unknown compression type %s." % compression_type)
--- 
-2.1.4
-

package/nodejs/0.12.9/0002-gyp-force-link-command-to-use-CXX.patch deleted +0 ~~-27~~

deleted file mode 100644
index 3b007f1..0000000
@@ -1,27 +0,0 @@
-From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001
-From: Martin Bark <[email protected]>
-Date: Tue, 30 Jun 2015 09:43:47 +0100
-Subject: [PATCH 2/4] gyp: force link command to use CXX
-
-Signed-off-by: Samuel Martin <[email protected]>
-Signed-off-by: Martin Bark <[email protected]>
----
- tools/gyp/pylib/gyp/generator/make.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
-index b88a433..0a1f2e0 100644
---- a/tools/gyp/pylib/gyp/generator/make.py
-+++ b/tools/gyp/pylib/gyp/generator/make.py
-@@ -141,7 +141,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
- # special "figure out circular dependencies" flags around the entire
- # input list during linking.
- quiet_cmd_link = LINK($(TOOLSET)) $@
--cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
-+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
- 
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
--- 
-2.1.4
-

package/nodejs/0.12.9/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch deleted +0 ~~-63~~

63 lines not on this page · raw message

package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch deleted +0 ~~-44~~

44 lines not on this page · raw message

package/nodejs/0.12.9/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch deleted +0 ~~-30~~

deleted file mode 100644
index 94d9eff..0000000
@@ -1,30 +0,0 @@
-From b7b69cdcdb4e2d80a85e303cc3230666d565bc39 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Sun, 11 Oct 2015 09:14:52 +0200
-Subject: [PATCH] Fix typo for arm predefined macro in
- atomicops_internals_arm_gcc.h
-
-Fix typo  __ARM_ARCH_6KZ__ vs.  __ARM_ARCH_6ZK__, fixes
-compile for raspberry pi.
-
-Signed-off-by: Peter Seiderer <[email protected]>
----
- deps/v8/src/base/atomicops_internals_arm_gcc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/v8/src/base/atomicops_internals_arm_gcc.h b/deps/v8/src/base/atomicops_internals_arm_gcc.h
-index 069b1ff..b924981 100644
---- a/deps/v8/src/base/atomicops_internals_arm_gcc.h
-+++ b/deps/v8/src/base/atomicops_internals_arm_gcc.h
-@@ -63,7 +63,7 @@ inline void MemoryBarrier() {
-     defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
-     defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
-     defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
--    defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6T2__)
-+    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
- 
- inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                          Atomic32 old_value,
--- 
-2.1.4
-

package/nodejs/Config.in +0 -5

index 769710c..cba320c 100644
@@ -44,10 +44,6 @@ choice
 config BR2_BR2_PACKAGE_NODEJS_0_10_X
 	bool "v0.10.41"
 
-config BR2_BR2_PACKAGE_NODEJS_0_12_X
-	bool "v0.12.9"
-	depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
-
 config BR2_PACKAGE_NODEJS_5_X
 	bool "v5.3.0"
 	depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS

@@ -64,7 +60,6 @@ endchoice
 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 "5.3.0"		if BR2_PACKAGE_NODEJS_5_X
 
 menu "Module Selection"

package/nodejs/nodejs.hash +0 -3

index c3bdc44..dc56efa 100644
@@ -1,8 +1,5 @@
 # From upstream URL: http://nodejs.org/dist/v0.10.41/SHASUMS256.txt
 sha256	79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995  node-v0.10.41.tar.gz
 
-# 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/v5.3.0/SHASUMS256.txt
 sha256  e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e  node-v5.3.0.tar.xz

Signature · 1 line

2.5.0

Martin Bark

author

2015-12-17 23:20 UTC #2 lore raw

PATCH v2 3/5 package/nodejs: correct 0.10.x option name

In reply to Martin Bark

The nodejs options incorrectly started BR2_BR2_xxx. This change corrects the name for 0.10.x releases to BR2_PACKAGE_NODEJS_0_10_X

Signed-off-by Martin Bark <[email protected]>

---
Changes v1 -> v2
- New in v2

---
 Config.in.legacy         | 8 ++++++++
 package/nodejs/Config.in | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

Config.in.legacy +8 -0

index db1eeae..5d9a3ee 100644
@@ -186,6 +186,14 @@ 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_0_10_X
+	bool "nodejs 0.10.x option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NODEJS_0_10_X
+	help
+	  nodejs 0.10.x option was named incorrectly and been renamed
+	  to BR2_PACKAGE_NODEJS_0_10_X.
+
 config BR2_BR2_PACKAGE_NODEJS_0_12_X
 	bool "nodejs version 0.12.x has been removed"
 	select BR2_LEGACY

package/nodejs/Config.in +3 -3

index cba320c..5d776d7 100644
@@ -36,12 +36,12 @@ 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_PACKAGE_NODEJS_0_10_X if BR2_ARM_CPU_ARMV5
 	default BR2_PACKAGE_NODEJS_5_X
 	help
 	  Select the version of Node.js you wish to use.
 
-config BR2_BR2_PACKAGE_NODEJS_0_10_X
+config BR2_PACKAGE_NODEJS_0_10_X
 	bool "v0.10.41"
 
 config BR2_PACKAGE_NODEJS_5_X

@@ -59,7 +59,7 @@ endchoice
 
 config BR2_PACKAGE_NODEJS_VERSION_STRING
 	string
-	default "0.10.41"	if BR2_BR2_PACKAGE_NODEJS_0_10_X
+	default "0.10.41"	if BR2_PACKAGE_NODEJS_0_10_X
 	default "5.3.0"		if BR2_PACKAGE_NODEJS_5_X
 
 menu "Module Selection"

Signature · 1 line

2.5.0

Yann E. MORIN

2015-12-18 21:12 UTC #3 lore raw

PATCH v2 3/5 package/nodejs: correct 0.10.x option name

Martin, All,

On 2015-12-17 23:20 +0000, Martin Bark spake thusly:

Quoted 18 lines

The nodejs options incorrectly started BR2_BR2_xxx. This change corrects the name for 0.10.x releases to BR2_PACKAGE_NODEJS_0_10_X
Signed-off-by Martin Bark <[email protected]>
---
Changes v1 -> v2
- New in v2
---
 Config.in.legacy         | 8 ++++++++
 package/nodejs/Config.in | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
Config.in.legacy +0 -0
index db1eeae..5d9a3ee 100644

Config.in.legacy config BR2_PACKAGE_INFOZIP · line 192

Quoted 7 lines

Config.in.legacy +4 -0

@@ -186,6 +186,14 @@ 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_0_10_X
+	bool "nodejs 0.10.x option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NODEJS_0_10_X

No, you can't select an option that is in a choice. All you can do in this case is tell the user to check his configuration, and refer him to the version choice.

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Arnout Vandecappelle

2015-12-18 22:47 UTC #4 lore raw

PATCH v2 3/5 package/nodejs: correct 0.10.x option name

Quoted 24 lines · Yann E. MORIN

Martin, All,
On 2015-12-17 23:20 +0000, Martin Bark spake thusly:
Quoted 21 lines
The nodejs options incorrectly started BR2_BR2_xxx. This change corrects the name for 0.10.x releases to BR2_PACKAGE_NODEJS_0_10_X
Signed-off-by Martin Bark <[email protected]>
---
Changes v1 -> v2
- New in v2
---
 Config.in.legacy         | 8 ++++++++
 package/nodejs/Config.in | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
Config.in.legacy +0 -0
index db1eeae..5d9a3ee 100644
@@ -186,6 +186,14 @@ config BR2_PACKAGE_INFOZIP
 	  to avoid ambiguities with Info-Zip's UnZip which has been added
 	  in the unzip package.
 

Quoted 8 lines

Config.in.legacy config BR2_PACKAGE_INFOZIP · line 192
Quoted 4 lines
Config.in.legacy +4 -0
+config BR2_BR2_PACKAGE_NODEJS_0_10_X
+	bool "nodejs 0.10.x option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NODEJS_0_10_X
No, you can't select an option that is in a choice. All you can do in this case is tell the user to check his configuration, and refer him to the version choice.

Actually, you can do the same like we do for legacy string options:

config BR2_PACKAGE_NODEJS_0_10_X

	bool "v0.10.41"
	default y if BR2_BR2_PACKAGE_NODEJS_0_10_X

In that case you should also add a comment to Config.in.legacy to remind us to
remove it again when the legacy option is removed.

We should probably add this to the documentation at the top of Config.in.legacy.

Regards,
Arnout

Quoted 4 lines

Regards,
Yann E. MORIN.

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Martin Bark

author

2015-12-20 17:03 UTC #5 lore raw

PATCH v2 3/5 package/nodejs: correct 0.10.x option name

Yann, Arnout,

Quoted 36 lines · Arnout Vandecappelle

Quoted 24 lines · Yann E. MORIN
Martin, All,
On 2015-12-17 23:20 +0000, Martin Bark spake thusly:
Quoted 21 lines
The nodejs options incorrectly started BR2_BR2_xxx. This change corrects the name for 0.10.x releases to BR2_PACKAGE_NODEJS_0_10_X
Signed-off-by Martin Bark <[email protected]>
---
Changes v1 -> v2
- New in v2
---
 Config.in.legacy         | 8 ++++++++
 package/nodejs/Config.in | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
Config.in.legacy +0 -0
index db1eeae..5d9a3ee 100644
@@ -186,6 +186,14 @@ config BR2_PACKAGE_INFOZIP
       to avoid ambiguities with Info-Zip's UnZip which has been added
       in the unzip package.
 
Quoted 8 lines
Config.in.legacy config BR2_PACKAGE_INFOZIP · line 192
Quoted 4 lines
Config.in.legacy +4 -0
+config BR2_BR2_PACKAGE_NODEJS_0_10_X
+    bool "nodejs 0.10.x option renamed"
+    select BR2_LEGACY
+    select BR2_PACKAGE_NODEJS_0_10_X
No, you can't select an option that is in a choice. All you can do in this case is tell the user to check his configuration, and refer him to the version choice.
Actually, you can do the same like we do for legacy string options:

Quoted 8 lines

config BR2_PACKAGE_NODEJS_0_10_X
        bool "v0.10.41"
        default y if BR2_BR2_PACKAGE_NODEJS_0_10_X
In that case you should also add a comment to Config.in.legacy to remind us to
remove it again when the legacy option is removed.
We should probably add this to the documentation at the top of Config.in.legacy.

Thanks for the info, i did not know this. I'll be sending an update patch set soon.

Thanks

Martin

Quoted 18 lines

Regards,
Arnout

Quoted 4 lines

Regards,
Yann E. MORIN.

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Martin Bark

author

2015-12-17 23:20 UTC #6 lore raw

PATCH v2 4/5 package/nodejs: fix support for uClibc-ng

In reply to Martin Bark

Fix segmentation fault in node.js when using uClibc-ng.

This patch fixes bug #8296, see
https://bugs.busybox.net/show_bug.cgi?id=8296.

Signed-off-by Martin Bark <[email protected]>

---
Changes v1 -> v2
- Updated for node 5.3.0. removed patches for 0.12.9 and 4.2.3

---
 .../0005-Fix-crash-in-GetInterfaceAddresses.patch  | 37 ++++++++++++++++++++++
 .../5.3.0/0006-Fix-support-for-uClibc-ng.patch     | 32 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 package/nodejs/5.3.0/0005-Fix-crash-in-GetInterfaceAddresses.patch
 create mode 100644 package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch

package/nodejs/5.3.0/0005-Fix-crash-in-GetInterfaceAddresses.patch new file +37 -0

new file mode 100644
index 0000000..d964290
@@ -0,0 +1,37 @@
+From 839bd9d147b2c85fe70196c86dbdbed504762caf Mon Sep 17 00:00:00 2001
+From: "Bark, Martin" <[email protected]>
+Date: Mon, 14 Dec 2015 13:27:51 +0000
+Subject: [PATCH 1/2] Fix crash in GetInterfaceAddresses
+
+If uv_interface_addresses() returns UV_ENOSYS then interfaces and count are
+uninitialised. This can cause a segmentation fault inside
+GetInterfaceAddresses when it tries to use the invalid interfaces[]. Fix
+the issue by returning from GetInterfaceAddresses on the UV_ENOSYS error.
+
+This issue was observed when using uCLibc-ng version 1.0.9 because
+uv_interface_addresses() in deps/uv/src/unix/linux-core.c incorrectly
+undefines HAVE_IFADDRS_H.
+
+Submitted upstream, see https://github.com/nodejs/node/pull/4272
+
+Signed-off-by: Martin Bark <[email protected]>
+---
+ src/node_os.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/node_os.cc b/src/node_os.cc
+index a100090..92f53a9 100644
+--- a/src/node_os.cc
++++ b/src/node_os.cc
+@@ -200,7 +200,7 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
+   ret = Object::New(env->isolate());
+ 
+   if (err == UV_ENOSYS) {
+-    args.GetReturnValue().Set(ret);
++    return args.GetReturnValue().Set(ret);
+   } else if (err) {
+     return env->ThrowUVException(err, "uv_interface_addresses");
+   }
+-- 
+2.6.2
+

package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +32 -0

new file mode 100644
index 0000000..918a36a
@@ -0,0 +1,32 @@
+From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001
+From: "Bark, Martin" <[email protected]>
+Date: Mon, 14 Dec 2015 13:26:10 +0000
+Subject: [PATCH 2/2] Fix support for uClibc-ng
+
+uClibc-ng is currently at v1.0.9.  The patch corrects the uClibc
+version test so that HAVE_IFADDRS_H is defined for uClibc versions
+after v0.9.32.
+
+Submitted upstream to libuv, see https://github.com/libuv/libuv/pull/653
+
+Signed-off-by: Bark, Martin <[email protected]>
+---
+ deps/uv/src/unix/linux-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
+index e6e6828..6cbbb71 100644
+--- a/deps/uv/src/unix/linux-core.c
++++ b/deps/uv/src/unix/linux-core.c
+@@ -39,7 +39,7 @@
+ #define HAVE_IFADDRS_H 1
+ 
+ #ifdef __UCLIBC__
+-# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
++# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
+ #  undef HAVE_IFADDRS_H
+ # endif
+ #endif
+-- 
+2.6.2
+

Signature · 1 line

2.5.0

Yann E. MORIN

2015-12-18 21:15 UTC #7 lore raw

PATCH v2 4/5 package/nodejs: fix support for uClibc-ng

Martin, All,

On 2015-12-17 23:20 +0000, Martin Bark spake thusly:

Quoted 8 lines

Fix segmentation fault in node.js when using uClibc-ng.
This patch fixes bug #8296, see
https://bugs.busybox.net/show_bug.cgi?id=8296.
Signed-off-by Martin Bark <[email protected]>
---

[--SNIP--]

Quoted 6 lines

package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +0 -0
new file mode 100644
index 0000000..918a36a

package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch line 10

Quoted 10 lines

package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +10 -0

@@ -0,0 +1,32 @@
+From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001
+From: "Bark, Martin" <[email protected]>
+Date: Mon, 14 Dec 2015 13:26:10 +0000
+Subject: [PATCH 2/2] Fix support for uClibc-ng
+
+uClibc-ng is currently at v1.0.9.  The patch corrects the uClibc
+version test so that HAVE_IFADDRS_H is defined for uClibc versions
+after v0.9.32.
+
+Submitted upstream to libuv, see https://github.com/libuv/libuv/pull/653

And that has since been accepted and applied:

    https://github.com/libuv/libuv/commit/c8619721404c2a9f97adc34a8c3b5336317311bc

Regards,
Yann E. MORIN.

Quoted 28 lines

package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +21 -0

+Signed-off-by: Bark, Martin <[email protected]>
+---
+ deps/uv/src/unix/linux-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
+index e6e6828..6cbbb71 100644
+--- a/deps/uv/src/unix/linux-core.c
++++ b/deps/uv/src/unix/linux-core.c
+@@ -39,7 +39,7 @@
+ #define HAVE_IFADDRS_H 1
+ 
+ #ifdef __UCLIBC__
+-# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
++# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
+ #  undef HAVE_IFADDRS_H
+ # endif
+ #endif
+-- 
+2.6.2
+

Signature · 6 lines

2.5.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Martin Bark

author

2015-12-20 16:58 UTC #8 lore raw

PATCH v2 4/5 package/nodejs: fix support for uClibc-ng

Yann,

Quoted 30 lines · Yann E. MORIN

Martin, All,
On 2015-12-17 23:20 +0000, Martin Bark spake thusly:
Quoted 8 lines
Fix segmentation fault in node.js when using uClibc-ng.
This patch fixes bug #8296, see
https://bugs.busybox.net/show_bug.cgi?id=8296.
Signed-off-by Martin Bark <[email protected]>
---
[--SNIP--]
Quoted 6 lines
package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +0 -0
new file mode 100644
index 0000000..918a36a
package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch line 10
Quoted 10 lines
package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +10 -0
@@ -0,0 +1,32 @@
+From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001
+From: "Bark, Martin" <[email protected]>
+Date: Mon, 14 Dec 2015 13:26:10 +0000
+Subject: [PATCH 2/2] Fix support for uClibc-ng
+
+uClibc-ng is currently at v1.0.9.  The patch corrects the uClibc
+version test so that HAVE_IFADDRS_H is defined for uClibc versions
+after v0.9.32.
+
+Submitted upstream to libuv, see https://github.com/libuv/libuv/pull/653
And that has since been accepted and applied:

Quoted 1 line

    https://github.com/libuv/libuv/commit/c8619721404c2a9f97adc34a8c3b5336317311bc

Good point, i'll update the comment in my next patch set

Quoted 40 lines

Regards,
Yann E. MORIN.
Quoted 24 lines
package/nodejs/5.3.0/0006-Fix-support-for-uClibc-ng.patch new file +21 -1
+Signed-off-by: Bark, Martin <[email protected]>
+---
+ deps/uv/src/unix/linux-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
+index e6e6828..6cbbb71 100644
+--- a/deps/uv/src/unix/linux-core.c
++++ b/deps/uv/src/unix/linux-core.c
+@@ -39,7 +39,7 @@
+ #define HAVE_IFADDRS_H 1
+
+ #ifdef __UCLIBC__
+-# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
++# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
+ #  undef HAVE_IFADDRS_H
+ # endif
+ #endif
+--
+2.6.2
+
--
2.5.0
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Martin Bark

author

2015-12-17 23:20 UTC #9 lore raw

PATCH v2 5/5 package/libuv: fix support for uClibc-ng

In reply to Martin Bark

See https://bugs.busybox.net/show_bug.cgi?id=8296 for further details on the origins of this bug.

This patch has been submitted upstream. See
https://github.com/libuv/libuv/pull/653

Signed-off-by Martin Bark <[email protected]>

---
Changes v1 -> v2
- Updated patch to be the same as in libuv/libuv/pull/653
- Reword commit message

---
 .../0001-unix-fix-support-for-uClibc-ng.patch      | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libuv/0001-unix-fix-support-for-uClibc-ng.patch

package/libuv/0001-unix-fix-support-for-uClibc-ng.patch new file +30 -0

new file mode 100644
index 0000000..6aec436
@@ -0,0 +1,30 @@
+From 21dcb3a98feb3ae6ba862cfbf25fba3361bc8a9b Mon Sep 17 00:00:00 2001
+From: Martin Bark <[email protected]>
+Date: Mon, 14 Dec 2015 21:46:17 +0000
+Subject: [PATCH] unix: fix support for uClibc-ng
+
+uClibc-ng is currently at v1.0.9.  The patch corrects the uClibc
+version test so that HAVE_IFADDRS_H is defined for uClibc versions
+after v0.9.32.
+
+Signed-off-by: Martin Bark <[email protected]>
+---
+ src/unix/linux-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
+index 3ff6fb1..4735bc4 100644
+--- a/src/unix/linux-core.c
++++ b/src/unix/linux-core.c
+@@ -39,7 +39,7 @@
+ #define HAVE_IFADDRS_H 1
+ 
+ #ifdef __UCLIBC__
+-# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
++# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
+ #  undef HAVE_IFADDRS_H
+ # endif
+ #endif
+-- 
+2.5.0
+

Signature · 1 line

2.5.0

Yann E. MORIN

2015-12-18 21:09 UTC #10 lore raw

PATCH v2 1/5 package/nodejs: bump version to 5.3.0

In reply to Martin Bark

Martin, All,

On 2015-12-17 23:20 +0000, Martin Bark spake thusly:

Quoted 10 lines

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 <[email protected]>

[--SNIP--]

Quoted 11 lines

package/nodejs/Config.in +1 -2

index b0f4f2b..769710c 100644
@@ -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

package/nodejs/Config.in config BR2_BR2_PACKAGE_NODEJS_0_12_X · line 60

Quoted 10 lines

package/nodejs/Config.in +4 -1

+	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

Wrong, this should be:

    depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR

Otherwise OK for me...

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Yann E. MORIN

2015-12-18 21:35 UTC #11 lore raw

PATCH v2 1/5 package/nodejs: bump version to 5.3.0

In reply to Martin Bark

Martin, All,

On 2015-12-17 23:20 +0000, Martin Bark spake thusly:

Quoted 10 lines

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 <[email protected]>

We've discussed yet a bit more about the nodejs versions with Thomas on IRC.

One idea we had was that we could just get rid of the version choice altogether form the Config.in.

Then, in the .mk, we'd set the version to 5.3.x if all conditions are met, or use 0.10.x otherwise.

What do you think about that?

Regards,
Yann E. MORIN.

Quoted 223 lines

---
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

Config.in.legacy +9 -0

index e1ea06f..ee67720 100644
@@ -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"

package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch deleted +0 ~~-46~~

deleted file mode 100644
index 7ff280b..0000000
@@ -1,46 +0,0 @@
-From 0b07d813adcfdc13ef6a0c56f88b864eb3dc4be9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
-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" <[email protected]>
-[J?rg Krause: adapt to version 4.2.3]
-Signed-off-by: J?rg Krause <[email protected]>
----
- 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

package/nodejs/5.3.0/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0

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

package/nodejs/5.3.0/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch +0 -0

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

package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0

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

package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch new file +39 -0

new file mode 100644
index 0000000..aec8e12
@@ -0,0 +1,39 @@
+From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001
+From: Martin Bark <[email protected]>
+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 <cstdarg>.  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 <[email protected]>
+---
+ 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 <cstdarg>
++
+ #include "src/allocation.h"
+ #include "src/base/platform/mutex.h"
+ #include "src/flags.h"
+-- 
+2.5.0
+

package/nodejs/Config.in +7 -5

index b0f4f2b..769710c 100644
@@ -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"

package/nodejs/nodejs.hash +2 -2

index 7d58a54..c3bdc44 100644
@@ -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

package/nodejs/nodejs.mk +1 -1

index 7ede89d..af47b26 100644
@@ -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

Signature · 6 lines

2.5.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Martin Bark

author

2015-12-20 16:59 UTC #12 lore raw

PATCH v2 1/5 package/nodejs: bump version to 5.3.0

Yann,

Quoted 17 lines · Yann E. MORIN

Martin, All,
On 2015-12-17 23:20 +0000, Martin Bark spake thusly:
Quoted 10 lines
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 <[email protected]>
We've discussed yet a bit more about the nodejs versions with Thomas on IRC.

Quoted 7 lines

One idea we had was that we could just get rid of the version choice altogether form the Config.in.
Then, in the .mk, we'd set the version to 5.3.x if all conditions are met, or use 0.10.x otherwise.
What do you think about that?

Yes i think that's a good idea. I'll work on a new patch set and include this.

Thanks

Martin

Quoted 235 lines

Regards,
Yann E. MORIN.

Quoted 219 lines

---
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

Config.in.legacy +9 -0

index e1ea06f..ee67720 100644
@@ -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"

package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch deleted +0 ~~-46~~

deleted file mode 100644
index 7ff280b..0000000
@@ -1,46 +0,0 @@
-From 0b07d813adcfdc13ef6a0c56f88b864eb3dc4be9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
-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" <[email protected]>
-[J?rg Krause: adapt to version 4.2.3]
-Signed-off-by: J?rg Krause <[email protected]>
----
- 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

package/nodejs/5.3.0/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0

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

package/nodejs/5.3.0/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch +0 -0

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

package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0

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

package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch new file +39 -0

new file mode 100644
index 0000000..aec8e12
@@ -0,0 +1,39 @@
+From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001
+From: Martin Bark <[email protected]>
+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 <cstdarg>.  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 <[email protected]>
+---
+ 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 <cstdarg>
++
+ #include "src/allocation.h"
+ #include "src/base/platform/mutex.h"
+ #include "src/flags.h"
+--
+2.5.0
+

package/nodejs/Config.in +7 -5

index b0f4f2b..769710c 100644
@@ -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"

package/nodejs/nodejs.hash +2 -2

index 7d58a54..c3bdc44 100644
@@ -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

package/nodejs/nodejs.mk +1 -2

index 7ede89d..af47b26 100644
@@ -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
--

2.5.0

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'