Remove NodeJS v11 hack

This commit is contained in:
Alexandre Lissy 2018-11-16 14:37:53 +01:00
parent 4bf0fd7d54
commit 4867d6baa4
4 changed files with 2 additions and 77 deletions

View File

@ -41,7 +41,7 @@ node-wrapper: copy-deps build
$(NODE_BUILD_TOOL) $(NODE_PLATFORM_TARGET) $(NODE_ABI_TARGET) package $(NODE_BUILD_VERBOSE)
npm-pack: clean package.json README.md index.js
npm install node-pre-gyp@0.11.x
npm install node-pre-gyp@0.12.x
npm pack $(NODE_BUILD_VERBOSE)
deepspeech_wrap.cxx: deepspeech.i

View File

@ -1,66 +0,0 @@
From f356b37c438c726516653ca2fd830359654c5b70 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sat, 27 Oct 2018 00:25:50 +0200
Subject: [PATCH] Updating crosswalk information.
---
lib/util/abi_crosswalk.json | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/lib/util/abi_crosswalk.json b/lib/util/abi_crosswalk.json
index a9f2ea4..9a07647 100644
--- a/lib/util/abi_crosswalk.json
+++ b/lib/util/abi_crosswalk.json
@@ -1503,6 +1503,10 @@
"node_abi": 48,
"v8": "5.1"
},
+ "6.14.4": {
+ "node_abi": 48,
+ "v8": "5.1"
+ },
"7.0.0": {
"node_abi": 51,
"v8": "5.4"
@@ -1671,6 +1675,14 @@
"node_abi": 57,
"v8": "6.2"
},
+ "8.11.4": {
+ "node_abi": 57,
+ "v8": "6.2"
+ },
+ "8.12.0": {
+ "node_abi": 57,
+ "v8": "6.2"
+ },
"9.0.0": {
"node_abi": 59,
"v8": "6.2"
@@ -1786,5 +1798,25 @@
"10.8.0": {
"node_abi": 64,
"v8": "6.7"
+ },
+ "10.9.0": {
+ "node_abi": 64,
+ "v8": "6.8"
+ },
+ "10.10.0": {
+ "node_abi": 64,
+ "v8": "6.8"
+ },
+ "10.11.0": {
+ "node_abi": 64,
+ "v8": "6.8"
+ },
+ "10.12.0": {
+ "node_abi": 64,
+ "v8": "6.8"
+ },
+ "11.0.0": {
+ "node_abi": 67,
+ "v8": "7.0"
}
}
\ No newline at end of file

View File

@ -30,7 +30,7 @@
"host" : "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.v1.0.0-warpctc.arm/artifacts/public/"
},
"dependencies" : {
"node-pre-gyp": "0.11.x",
"node-pre-gyp": "0.12.x",
"argparse": "1.0.x",
"sox-stream": "2.0.x",
"memory-stream": "0.0.3",

View File

@ -579,15 +579,6 @@ do_deepspeech_nodejs_build()
npm update && npm install node-gyp node-pre-gyp
#FIXME: Remove when https://github.com/mapbox/node-pre-gyp/issues/421 is fixed
node_pre_gyp="$(npm root)/node-pre-gyp/"
abi_crosswalk="${node_pre_gyp}lib/util/abi_crosswalk.json"
has_node_v11=$(grep -q "11.0.0" "${abi_crosswalk}" ; echo $?)
if [ "${has_node_v11}" -eq 1 ]; then
patch -d "${node_pre_gyp}" -p1 < native_client/javascript/node-pre-gyp_nodejs_v11.patch
fi;
export PATH="$(npm root)/.bin/:$PATH"
for node in ${SUPPORTED_NODEJS_VERSIONS}; do