diff options
Diffstat (limited to 'package/nodejs/4.2.3')
4 files changed, 207 insertions, 0 deletions
diff --git a/package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch new file mode 100644 index 0000000000..65bceef94a --- /dev/null +++ b/package/nodejs/4.2.3/0001-Remove-dependency-on-Python-bz2-module.patch @@ -0,0 +1,31 @@ +From 3d4817c152d6f3afddcc699949c4d1664da91e2b Mon Sep 17 00:00:00 2001 +From: Martin Bark <martin@barkynet.com> +Date: Tue, 30 Jun 2015 09:43:11 +0100 +Subject: [PATCH 1/4] Remove dependency on Python bz2 module + +Do not import the bz2 module, it is not used. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +[Martin: adapt to 0.12.5] +Signed-off-by: Martin Bark <martin@barkynet.com> +[yann.morin.1998@free.fr: adapt to 4.1.2] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + 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 + + +-- +2.1.4 + diff --git a/package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch new file mode 100644 index 0000000000..5746582c14 --- /dev/null +++ b/package/nodejs/4.2.3/0002-gyp-force-link-command-to-use-CXX.patch @@ -0,0 +1,29 @@ +From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001 +From: Martin Bark <martin@barkynet.com> +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 <s.martin49@gmail.com> +Signed-off-by: Martin Bark <martin@barkynet.com> +[yann.morin.1998@free.fr: adapt to 4.1.2] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + 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 +@@ -142,7 +142,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 + diff --git a/package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch b/package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch new file mode 100644 index 0000000000..3104644170 --- /dev/null +++ b/package/nodejs/4.2.3/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch @@ -0,0 +1,101 @@ +From 4a48c65921b0f05b621aef5b902b6aa54811ad7a Mon Sep 17 00:00:00 2001 +From: Martin Bark <martin@barkynet.com> +Date: Tue, 30 Jun 2015 09:44:33 +0100 +Subject: [PATCH 3/4] Use a python variable instead of hardcoding Python + +The nodejs build system uses python in a number of locations. However, +there are some locations where it hardcodes 'python' as the Python +interpreter. However, this causes problems when we need to use python2 +instead of just python. + +This patch fixes that by using the python variable already in place in +the nodejs build system. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +[Martin: adapt to 0.12.5] +Signed-off-by: Martin Bark <martin@barkynet.com> +[yann.morin.1998@free.fr: adapt to 4.1.2] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + deps/v8/tools/gyp/v8.gyp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp +index c703155..06c0b2b 100644 +--- a/deps/v8/tools/gyp/v8.gyp ++++ b/deps/v8/tools/gyp/v8.gyp +@@ -1696,14 +1696,14 @@ + '<(PRODUCT_DIR)/natives_blob_host.bin', + ], + 'action': [ +- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin' ++ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin' + ], + }, { + 'outputs': [ + '<(PRODUCT_DIR)/natives_blob.bin', + ], + 'action': [ +- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' ++ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' + ], + }], + ], +@@ -1712,7 +1712,7 @@ + '<(PRODUCT_DIR)/natives_blob.bin', + ], + 'action': [ +- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' ++ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' + ], + }], + ], +@@ -1812,7 +1812,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/js2c.py', + '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', + 'CORE', +@@ -1838,7 +1838,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/js2c.py', + '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', + 'EXPERIMENTAL', +@@ -1863,7 +1863,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/js2c.py', + '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', + 'EXTRAS', +@@ -1900,7 +1900,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', + ], + 'action': [ +- 'python', ++ '<(python)', + '../../tools/gen-postmortem-metadata.py', + '<@(_outputs)', + '<@(heapobject_files)' +diff --git a/deps/v8/build/toolchain.gypi b/deps/v8/build/toolchain.gypi +index c703155..06c0b2b 100644 +--- a/deps/v8/build/toolchain.gypi ++++ b/deps/v8/build/toolchain.gypi +@@ -38,7 +38,7 @@ + 'ubsan%': 0, + 'ubsan_vptr%': 0, + 'v8_target_arch%': '<(target_arch)', +- 'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")', ++ 'v8_host_byteorder%': '<!(<(python) -c "import sys; print sys.byteorder")', + # Native Client builds currently use the V8 ARM JIT and + # arm/simulator-arm.cc to defer the significant effort required + # for NaCl JIT support. The nacl_target_arch variable provides diff --git a/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch b/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch new file mode 100644 index 0000000000..7ff280b22e --- /dev/null +++ b/package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch @@ -0,0 +1,46 @@ +From 0b07d813adcfdc13ef6a0c56f88b864eb3dc4be9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +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" <yann.morin.1998@free.fr> +[Jörg Krause: adapt to version 4.2.3] +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + 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 |
