summaryrefslogtreecommitdiffstats
path: root/package/nodejs/4.1.2
diff options
context:
space:
mode:
Diffstat (limited to 'package/nodejs/4.1.2')
-rw-r--r--package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch31
-rw-r--r--package/nodejs/4.1.2/0002-gyp-force-link-command-to-use-CXX.patch29
-rw-r--r--package/nodejs/4.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch101
-rw-r--r--package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch18
4 files changed, 0 insertions, 179 deletions
diff --git a/package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch
deleted file mode 100644
index 65bceef94a..0000000000
--- a/package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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.1.2/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/4.1.2/0002-gyp-force-link-command-to-use-CXX.patch
deleted file mode 100644
index 5746582c14..0000000000
--- a/package/nodejs/4.1.2/0002-gyp-force-link-command-to-use-CXX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch b/package/nodejs/4.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
deleted file mode 100644
index 3104644170..0000000000
--- a/package/nodejs/4.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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.1.2/0004-fix-arm-vfpv2.patch b/package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch
deleted file mode 100644
index b753dfef02..0000000000
--- a/package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-configure: fix ARM VFPv2
-
-The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2'.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-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
OpenPOWER on IntegriCloud