From a1e5fd2cdf12e819eaa75b195d9729f83c1d88dd Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 1 Jun 2020 14:52:58 -0400 Subject: [PATCH 1/2] build: fix compiling addons with older versions of Node.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `common.gypi` is used by `node-gyp` to compile addons. Default values must be provided for variables that may not exist on older versions of Node.js so that older versions of Node.js can be used to compile addons for later versions of Node.js. Add default values for `v8_enable_pointer_compression` and `v8_enable_31bit_smis_on_64bit_arch`. PR-URL: https://github.com/nodejs/node/pull/33688 Refs: https://github.com/nodejs/node/pull/30463 Reviewed-By: Luigi Pinca Reviewed-By: Michaël Zasso Reviewed-By: Ben Noordhuis Reviewed-By: Matteo Collina Signed-off-by: Richard Lau --- common.gypi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common.gypi b/common.gypi index 6fe46076ff8def..9801c3257ca322 100644 --- a/common.gypi +++ b/common.gypi @@ -57,6 +57,12 @@ # https://github.com/nodejs/node/pull/22920/files#r222779926 'v8_enable_handle_zapping': 0, + # Disable pointer compression. Can be enabled at build time via configure + # options but default values are required here as this file is also used by + # node-gyp to build addons. + 'v8_enable_pointer_compression%': 0, + 'v8_enable_31bit_smis_on_64bit_arch%': 0, + # Disable V8 untrusted code mitigations. # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations 'v8_untrusted_code_mitigations': 0, From 25d48a63c045a8c52f560e050710176a5a4ee304 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 3 Jun 2020 21:59:33 -0700 Subject: [PATCH 2/2] doc: add lint disabling comment for collaborator list Disable linting for prohibited strings in the collaborator list so that sam-github does not have to be sam-GitHub. Refs: https://github.com/nodejs/remark-preset-lint-node/pull/96 Signed-off-by: Rich Trott PR-URL: https://github.com/nodejs/node/pull/33719 Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: Beth Griggs --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 14add86124b821..fda0fc98ea2340 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ For information about the governance of the Node.js project, see ### TSC (Technical Steering Committee) + * [addaleax](https://github.com/addaleax) - **Anna Henningsen** <anna@addaleax.net> (she/her) * [apapirovski](https://github.com/apapirovski) - @@ -545,6 +546,7 @@ For information about the governance of the Node.js project, see **Vse Mozhet Byt** <vsemozhetbyt@gmail.com> (he/him) * [whitlockjc](https://github.com/whitlockjc) - **Jeremy Whitlock** <jwhitlock@apache.org> + Collaborators follow the [Collaborator Guide](./doc/guides/collaborator-guide.md) in maintaining the Node.js project.