[Pkg-javascript-commits] [node-gyp] 03/03: work around node-gyp expecting newer version of gyp

Ximin Luo infinity0 at debian.org
Mon Aug 31 01:57:40 UTC 2015


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository node-gyp.

commit 0f40c98ffcd82a39191ee442d9df539162293a36
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Aug 31 03:55:31 2015 +0200

    work around node-gyp expecting newer version of gyp
---
 debian/control                      |  2 +-
 debian/patches/rm-no-parallel.patch | 17 +++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e4b17f1..d83762b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends:
  ${misc:Depends}
  , nodejs
  , nodejs-dev
- , gyp
+ , gyp (<< 0.1~svn1773)
  , node-debug
  , node-fstream
  , node-glob
diff --git a/debian/patches/rm-no-parallel.patch b/debian/patches/rm-no-parallel.patch
new file mode 100644
index 0000000..4aa2539
--- /dev/null
+++ b/debian/patches/rm-no-parallel.patch
@@ -0,0 +1,17 @@
+Description: Don't use non-existent option
+ Updating gyp will be a pain, so just disable it here for the time being.
+Author: Jeremy Wei <shuimuqingshu at gmail.com>
+Bug: https://github.com/nodejs/node-gyp/issues/426
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/configure.js
++++ b/lib/configure.js
+@@ -333,7 +333,6 @@
+     argv.push('-Dnode_gyp_dir=' + nodeGypDir)
+     argv.push('-Dmodule_root_dir=' + process.cwd())
+     argv.push('--depth=.')
+-    argv.push('--no-parallel')
+ 
+     // tell gyp to write the Makefile/Solution files into output_dir
+     argv.push('--generator-output', output_dir)
diff --git a/debian/patches/series b/debian/patches/series
index 89cf513..7a3b646 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 2001_rename_shebang_to_nodejs.patch
 2002_set_default_nodedir.patch
 2003_fPIC_ia32.patch
+rm-no-parallel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-gyp.git



More information about the Pkg-javascript-commits mailing list