summaryrefslogtreecommitdiffstats
path: root/package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch
diff options
context:
space:
mode:
authorJörg Krause <joerg.krause@embedded.rocks>2015-12-08 22:18:19 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-12 18:28:13 +0100
commit9d3b69dfdd2af06da20d04b84d6ae35f57789877 (patch)
treebd2b4a17bb0fe0336091c278ad7e940ccb21453d /package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch
parent5cff6a83c66eff671831cb5fc6b9c96a4199677f (diff)
downloadbuildroot-9d3b69dfdd2af06da20d04b84d6ae35f57789877.tar.gz
buildroot-9d3b69dfdd2af06da20d04b84d6ae35f57789877.zip
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 <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch')
-rw-r--r--package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch
new file mode 100644
index 0000000000..24a78a4e1a
--- /dev/null
+++ b/package/nodejs/0.12.9/0001-Remove-dependency-on-Python-bz2-module.patch
@@ -0,0 +1,39 @@
+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
+
+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 <thomas.petazzoni@free-electrons.com>
+[Martin: adapt to 0.12.5]
+Signed-off-by: Martin Bark <martin@barkynet.com>
+---
+ 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
+
OpenPOWER on IntegriCloud