package/nodejs: bump 0.10.x branch to version 0.10.41
PATCH 1/3 package/nodejs: bump 0.10.x branch to version 0.10.41
Also remove a patch applied upstream.
Signed-off-by J?rg Krause <[email protected]>
---
...4-fix-build-error-without-OpenSSL-support.patch | 54 ----------------------
.../0001-remove-python-bz2-dependency.patch | 0
.../0002-gyp-force-link-command-to-use-CXX.patch | 0
.../0003-use-python-variable.patch | 0
.../0004-fix-musl-USE-MISC-build-issue.patch} | 0
package/nodejs/Config.in | 4 +-
package/nodejs/nodejs.hash | 4 +-
7 files changed, 4 insertions(+), 58 deletions(-)
delete mode 100644 package/nodejs/0.10.40/0004-fix-build-error-without-OpenSSL-support.patch
rename package/nodejs/{0.10.40 => 0.10.41}/0001-remove-python-bz2-dependency.patch (100%)
rename package/nodejs/{0.10.40 => 0.10.41}/0002-gyp-force-link-command-to-use-CXX.patch (100%)
rename package/nodejs/{0.10.40 => 0.10.41}/0003-use-python-variable.patch (100%)
rename package/nodejs/{0.10.40/0005-fix-musl-USE-MISC-build-issue.patch => 0.10.41/0004-fix-musl-USE-MISC-build-issue.patch} (100%)package/nodejs/0.10.40/0004-fix-build-error-without-OpenSSL-support.patch deleted +0 -54
@@ -1,54 +0,0 @@ -From d9acdddb42aef48a9504368019beb1ad91c9a0c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]> -Date: Mon, 17 Nov 2014 12:34:05 +0100 -Subject: [PATCH 1/1] src/node.cc: fix build error without OpenSSL support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: J?rg Krause <[email protected]> ---- - src/node.cc | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/node.cc b/src/node.cc -index 18c743f..cb77f08 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -82,7 +82,6 @@ typedef int mode_t; - #include "node_script.h" - #include "v8_typed_array.h" - --#include "node_crypto.h" - #include "util.h" - - using namespace v8; -@@ -2544,8 +2543,10 @@ static void PrintHelp() { - " --trace-deprecation show stack traces on deprecations\n" - " --v8-options print v8 command line options\n" - " --max-stack-size=val set max v8 stack size (bytes)\n" -+#if HAVE_OPENSSL - " --enable-ssl2 enable ssl2\n" - " --enable-ssl3 enable ssl3\n" -+#endif - "\n" - "Environment variables:\n" - #ifdef _WIN32 -@@ -2579,12 +2580,14 @@ static void ParseArgs(int argc, char **argv) { - p = 1 + strchr(arg, '='); - max_stack_size = atoi(p); - argv[i] = const_cast<char*>(""); -+#if HAVE_OPENSSL - } else if (strcmp(arg, "--enable-ssl2") == 0) { - SSL2_ENABLE = true; - argv[i] = const_cast<char*>(""); - } else if (strcmp(arg, "--enable-ssl3") == 0) { - SSL3_ENABLE = true; - argv[i] = const_cast<char*>(""); -+#endif - } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { - PrintHelp(); - exit(0); --- -2.1.3 -
package/nodejs/0.10.41/0001-remove-python-bz2-dependency.patch renamed from package/nodejs/0.10.40/0001-remove-python-bz2-dependency.patch +0 -0
package/nodejs/0.10.41/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/0.10.40/0002-gyp-force-link-command-to-use-CXX.patch +0 -0
package/nodejs/0.10.41/0003-use-python-variable.patch renamed from package/nodejs/0.10.40/0003-use-python-variable.patch +0 -0
package/nodejs/0.10.41/0004-fix-musl-USE-MISC-build-issue.patch renamed from package/nodejs/0.10.40/0005-fix-musl-USE-MISC-build-issue.patch +0 -0
package/nodejs/Config.in +2 -2
@@ -42,7 +42,7 @@ choice Select the version of Node.js you wish to use. config BR2_BR2_PACKAGE_NODEJS_0_10_X - bool "v0.10.40" + bool "v0.10.41" config BR2_BR2_PACKAGE_NODEJS_0_12_X bool "v0.12.7"
@@ -61,7 +61,7 @@ endchoice config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "0.10.40" if BR2_BR2_PACKAGE_NODEJS_0_10_X + default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X default "0.12.7" if BR2_BR2_PACKAGE_NODEJS_0_12_X default "4.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X
package/nodejs/nodejs.hash +2 -2
@@ -1,5 +1,5 @@ -# From upstream URL: http://nodejs.org/dist/v0.10.40/SHASUMS256.txt -sha256 bae79c2fd959aebe1629af36077bebbb760128db753da226d2344cd91499149f node-v0.10.40.tar.gz +# 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.7/SHASUMS256.txt sha256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d node-v0.12.7.tar.gz
Signature · 1 line
2.6.3
PATCH 2/3 package/nodejs: bump 0.12.x branch to version 0.12.9
Patch #4 was applied upstream, however a new bug was introduced which breaks building nodejs without OpenSSL support. We replace the applied patch with a new patch to fix:
error: ?ALLOW_INSECURE_SERVER_DHPARAM? was not declared in this scope
ALLOW_INSECURE_SERVER_DHPARAM = true;
Patch #4 status: Sent upstream [1]
[1] https://github.com/nodejs/node/pull/4201
Signed-off-by J?rg Krause <[email protected]>
---
...4-fix-build-error-without-OpenSSL-support.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
...c-fix-build-error-without-OpenSSL-support.patch | 44 +++++++++++++++++++++
...or-arm-predefined-macro-in-atomicops_inte.patch | 0
package/nodejs/Config.in | 4 +-
package/nodejs/nodejs.hash | 4 +-
8 files changed, 48 insertions(+), 50 deletions(-)
delete mode 100644 package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch
rename package/nodejs/{0.12.7 => 0.12.9}/0001-Remove-dependency-on-Python-bz2-module.patch (100%)
rename package/nodejs/{0.12.7 => 0.12.9}/0002-gyp-force-link-command-to-use-CXX.patch (100%)
rename package/nodejs/{0.12.7 => 0.12.9}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%)
create mode 100644 package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch
rename package/nodejs/{0.12.7 => 0.12.9}/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch (100%)package/nodejs/0.12.7/0004-fix-build-error-without-OpenSSL-support.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From 6bfa497dceb83de5257c64da59fbcf6a32d83305 Mon Sep 17 00:00:00 2001 -From: Martin Bark <[email protected]> -Date: Tue, 30 Jun 2015 09:45:07 +0100 -Subject: [PATCH 4/4] fix build error without OpenSSL support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: J?rg Krause <[email protected]> -[Martin: adapt to 0.12.5] -Signed-off-by: Martin Bark <[email protected]> ---- - src/node.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/node.cc b/src/node.cc -index e669706..d43b791 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -2934,8 +2934,10 @@ static void PrintHelp() { - " present.\n" - #endif - #endif -+#if HAVE_OPENSSL - " --enable-ssl2 enable ssl2\n" - " --enable-ssl3 enable ssl3\n" -+#endif - "\n" - "Environment variables:\n" - #ifdef _WIN32 -@@ -3003,10 +3005,12 @@ static void ParseArgs(int* argc, - } else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) { - printf("%s\n", NODE_VERSION); - exit(0); -+#if HAVE_OPENSSL - } else if (strcmp(arg, "--enable-ssl2") == 0) { - SSL2_ENABLE = true; - } else if (strcmp(arg, "--enable-ssl3") == 0) { - SSL3_ENABLE = true; -+#endif - } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { - PrintHelp(); - exit(0); --- -2.1.4 -
package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/0.12.7/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0
package/nodejs/0.12.9/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/0.12.7/0002-gyp-force-link-command-to-use-CXX.patch +0 -0
package/nodejs/0.12.9/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/0.12.7/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0
package/nodejs/0.12.9/0004-src-fix-build-error-without-OpenSSL-support.patch new file +44 -0
44 lines not on this page · raw message
package/nodejs/0.12.9/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch renamed from package/nodejs/0.12.7/0005-Fix-typo-for-arm-predefined-macro-in-atomicops_inte.patch +0 -0
package/nodejs/Config.in +2 -2
@@ -45,7 +45,7 @@ config BR2_BR2_PACKAGE_NODEJS_0_10_X bool "v0.10.41" config BR2_BR2_PACKAGE_NODEJS_0_12_X - bool "v0.12.7" + bool "v0.12.9" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_BR2_PACKAGE_NODEJS_4_X
@@ -62,7 +62,7 @@ endchoice config BR2_PACKAGE_NODEJS_VERSION_STRING string default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X - default "0.12.7" if BR2_BR2_PACKAGE_NODEJS_0_12_X + default "0.12.9" if BR2_BR2_PACKAGE_NODEJS_0_12_X default "4.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X menu "Module Selection"
package/nodejs/nodejs.hash +2 -2
@@ -1,8 +1,8 @@ # 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.7/SHASUMS256.txt -sha256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d node-v0.12.7.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/v4.1.2/SHASUMS256.txt sha256 443c8251e812b1f2c4b3e9152a47df23c55567ade739e017e2c0ca0869b71e74 node-v4.1.2.tar.xz
Signature · 1 line
2.6.3
PATCH 3/3 package/nodejs: bump 4.x branch to version 4.2.3
In reply to Jörg KrauseSigned-off-by J?rg Krause <[email protected]>
---
package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch | 18 ---------
...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
package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch | 46 ++++++++++++++++++++++
package/nodejs/Config.in | 6 +--
package/nodejs/nodejs.hash | 4 +-
7 files changed, 51 insertions(+), 23 deletions(-)
delete mode 100644 package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch
rename package/nodejs/{4.1.2 => 4.2.3}/0001-Remove-dependency-on-Python-bz2-module.patch (100%)
rename package/nodejs/{4.1.2 => 4.2.3}/0002-gyp-force-link-command-to-use-CXX.patch (100%)
rename package/nodejs/{4.1.2 => 4.2.3}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%)
create mode 100644 package/nodejs/4.2.3/0004-fix-arm-vfpv2.patchpackage/nodejs/4.1.2/0004-fix-arm-vfpv2.patch deleted +0 -18
@@ -1,18 +0,0 @@ -configure: fix ARM VFPv2 - -The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2'. - -Signed-off-by: "Yann E. MORIN" <[email protected]> - -diff -durN a/configure b/configure ---- a/configure -+++ b/configure -@@ -611,7 +611,7 @@ - o['variables']['arm_fpu'] = 'vfpv3' - o['variables']['arm_version'] = '7' - else: -- o['variables']['arm_fpu'] = 'vfpv2' -+ o['variables']['arm_fpu'] = 'vfp' - o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default' - - o['variables']['arm_thumb'] = 0 # -marm
package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0
package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/4.1.2/0002-gyp-force-link-command-to-use-CXX.patch +0 -0
package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/4.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0
package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch new file +46 -0
46 lines not on this page · raw message
package/nodejs/Config.in +3 -3
@@ -49,11 +49,11 @@ config BR2_BR2_PACKAGE_NODEJS_0_12_X depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_BR2_PACKAGE_NODEJS_4_X - bool "v4.1.2" + bool "v4.2.3" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -comment "v4.1.2 needs a toolchain w/ gcc >= 4.8" +comment "v4.2.3 needs a toolchain w/ gcc >= 4.8" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -63,7 +63,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.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X + default "4.2.3" if BR2_BR2_PACKAGE_NODEJS_4_X menu "Module Selection"
package/nodejs/nodejs.hash +2 -2
@@ -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.1.2/SHASUMS256.txt -sha256 443c8251e812b1f2c4b3e9152a47df23c55567ade739e017e2c0ca0869b71e74 node-v4.1.2.tar.xz +# From upstream URL: http://nodejs.org/dist/v4.2.3/SHASUMS256.txt +sha256 9e8aef1e47b317575c421c8d10a80e6c319b26969b566d3b84e49e65a92837f4 node-v4.2.3.tar.xz
Signature · 1 line
2.6.3
PATCH 1/3 package/nodejs: bump 0.10.x branch to version 0.10.41
In reply to Jörg KrauseDear J?rg Krause,
Quoted 17 lines · J?rg Krause
Also remove a patch applied upstream.
Signed-off-by J?rg Krause <[email protected]>--- ...4-fix-build-error-without-OpenSSL-support.patch | 54 ---------------------- .../0001-remove-python-bz2-dependency.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 .../0003-use-python-variable.patch | 0 .../0004-fix-musl-USE-MISC-build-issue.patch} | 0 package/nodejs/Config.in | 4 +- package/nodejs/nodejs.hash | 4 +- 7 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 package/nodejs/0.10.40/0004-fix-build-error-without-OpenSSL-support.patch rename package/nodejs/{0.10.40 => 0.10.41}/0001-remove-python-bz2-dependency.patch (100%) rename package/nodejs/{0.10.40 => 0.10.41}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{0.10.40 => 0.10.41}/0003-use-python-variable.patch (100%) rename package/nodejs/{0.10.40/0005-fix-musl-USE-MISC-build-issue.patch => 0.10.41/0004-fix-musl-USE-MISC-build-issue.patch} (100%)
I've applied all three patches. However, there is a problem: if you select a Cortex-A9 ARM processor, only the 0.10 version is visible, the 0.12 and 4.x versions are not visible. This is because for Cortex-A9, BR2_ARM_CPU_HAS_VFPV2 is not true. This is something that should be fixed at some point.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/3 package/nodejs: bump 0.10.x branch to version 0.10.41
Quoted 21 lines · Thomas Petazzoni
Dear J?rg Krause,
Quoted 17 lines · J?rg Krause
Also remove a patch applied upstream.
Signed-off-by J?rg Krause <[email protected]>--- ...4-fix-build-error-without-OpenSSL-support.patch | 54 ---------------------- .../0001-remove-python-bz2-dependency.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 .../0003-use-python-variable.patch | 0 .../0004-fix-musl-USE-MISC-build-issue.patch} | 0 package/nodejs/Config.in | 4 +- package/nodejs/nodejs.hash | 4 +- 7 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 package/nodejs/0.10.40/0004-fix-build-error-without-OpenSSL-support.patch rename package/nodejs/{0.10.40 => 0.10.41}/0001-remove-python-bz2-dependency.patch (100%) rename package/nodejs/{0.10.40 => 0.10.41}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{0.10.40 => 0.10.41}/0003-use-python-variable.patch (100%) rename package/nodejs/{0.10.40/0005-fix-musl-USE-MISC-build-issue.patch => 0.10.41/0004-fix-musl-USE-MISC-build-issue.patch} (100%)
Quoted 5 lines
I've applied all three patches. However, there is a problem: if you select a Cortex-A9 ARM processor, only the 0.10 version is visible, the 0.12 and 4.x versions are not visible. This is because for Cortex-A9,
BR2_ARM_CPU_HAS_VFPV2is not true. This is something that should be fixed at some point.
I guess, when BR2_ARM_FPU_VFPV3 of _D16 is selected, we should also selectBR2_ARM_CPU_HAS_VFPV3. Which is of course not possible because then we get a circular dependency. So more hidden intermediate symbols...
I wonder BTW, does v8 still work when SOFT_FLOAT is selected?
Regards,
Arnout
Quoted 5 lines
Thanks!
Thomas
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
PATCH 1/3 package/nodejs: bump 0.10.x branch to version 0.10.41
Arnout,
Quoted 3 lines · Arnout Vandecappelle
I guess, when
BR2_ARM_FPU_VFPV3of_D16is selected, we should also selectBR2_ARM_CPU_HAS_VFPV3. Which is of course not possible because then we get a circular dependency. So more hidden intermediate symbols...
Yes, the FPU selection is not yet good. If you have selected a VFPv3, then of course your VFP is compatible with VFPv2, so the corresponding symbols should be selected.
We need to rethink a bit these VFP Config.in options to make this work properly.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com