node:v10.x update to v10.10.0

imxiaohan · Sep 7, 2018 · 8974800 · 8974800
1 parent fc046eb
commit 8974800
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/node/patches/v10.x/010-execvp-arg-list-too-long.patch b/node/patches/v10.x/010-execvp-arg-list-too-long.patch
@@ -2,7 +2,7 @@ diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py b/de
 index 64b9dd267b..1ddd95b86b 100644
 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
 +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
-@@ -144,6 +144,30 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
+@@ -149,6 +149,30 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
  quiet_cmd_link = LINK($(TOOLSET)) $@
  cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
 
@@ -33,7 +33,7 @@ index 64b9dd267b..1ddd95b86b 100644
  # We support two kinds of shared objects (.so):
  # 1) shared_library, which is just bundling together many dependent libraries
  # into a link line.
-@@ -188,6 +212,30 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
+@@ -193,6 +217,30 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
  quiet_cmd_alink_thin = AR($(TOOLSET)) $@
  cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
 
@@ -64,7 +64,7 @@ index 64b9dd267b..1ddd95b86b 100644
  # Due to circular dependencies between libraries :(, we wrap the
  # special "figure out circular dependencies" flags around the entire
  # input list during linking.
-@@ -1603,11 +1651,17 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
+@@ -1611,11 +1659,17 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
              "Spaces in alink input filenames not supported (%s)"  % link_dep)
        if (self.flavor not in ('mac', 'openbsd', 'netbsd', 'win') and not
            self.is_standalone_static_library):

diff --git a/node/patches/v10.x/012-changing-default-npm-settings.patch b/node/patches/v10.x/012-changing-default-npm-settings.patch
@@ -2,7 +2,7 @@ diff --git a/deps/npm/lib/config/defaults.js b/deps/npm/lib/config/defaults.js
 index da019ac4d6..8b81e28940 100644
 --- a/deps/npm/lib/config/defaults.js
 +++ b/deps/npm/lib/config/defaults.js
-@@ -170,7 +170,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
+@@ -171,7 +171,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
      'legacy-bundling': false,
      link: false,
      'local-address': undefined,
@@ -11,7 +11,7 @@ index da019ac4d6..8b81e28940 100644
      logstream: process.stderr,
      'logs-max': 10,
      long: false,
-@@ -224,7 +224,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
+@@ -226,7 +226,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
      'sign-git-tag': false,
      'sso-poll-frequency': 500,
      'sso-type': 'oauth',