forked from pool/nodejs18
This commit is contained in:
@@ -8,10 +8,10 @@ management via update_alternatives.
|
||||
|
||||
This is also important for generation of binary
|
||||
modules for multiple versions of NodeJS
|
||||
Index: node-v18.4.0/Makefile
|
||||
Index: node-v18.7.0/Makefile
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/Makefile
|
||||
+++ node-v18.4.0/Makefile
|
||||
--- node-v18.7.0.orig/Makefile
|
||||
+++ node-v18.7.0/Makefile
|
||||
@@ -55,7 +55,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT
|
||||
EXEEXT := $(shell $(PYTHON) -c \
|
||||
"import sys; print('.exe' if sys.platform == 'win32' else '')")
|
||||
@@ -21,10 +21,10 @@ Index: node-v18.4.0/Makefile
|
||||
NODE ?= ./$(NODE_EXE)
|
||||
NODE_G_EXE = node_g$(EXEEXT)
|
||||
NPM ?= ./deps/npm/bin/npm-cli.js
|
||||
Index: node-v18.4.0/tools/install.py
|
||||
Index: node-v18.7.0/tools/install.py
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/tools/install.py
|
||||
+++ node-v18.4.0/tools/install.py
|
||||
--- node-v18.7.0.orig/tools/install.py
|
||||
+++ node-v18.7.0/tools/install.py
|
||||
@@ -86,7 +86,7 @@ def uninstall(paths, dst):
|
||||
try_remove(path, dst)
|
||||
|
||||
@@ -58,7 +58,7 @@ Index: node-v18.4.0/tools/install.py
|
||||
# Not the default just yet:
|
||||
# 'yarn': 'dist/yarn.js',
|
||||
# 'yarnpkg': 'dist/yarn.js',
|
||||
@@ -136,7 +136,7 @@ def subdir_files(path, dest, action):
|
||||
@@ -147,7 +147,7 @@ def subdir_files(path, dest, action):
|
||||
|
||||
def files(action):
|
||||
is_windows = sys.platform == 'win32'
|
||||
@@ -67,7 +67,7 @@ Index: node-v18.4.0/tools/install.py
|
||||
output_prefix = 'out/Release/'
|
||||
|
||||
if is_windows:
|
||||
@@ -154,7 +154,7 @@ def files(action):
|
||||
@@ -186,7 +186,7 @@ def files(action):
|
||||
action(['out/Release/node.d'], libdir() + '/dtrace/node.d')
|
||||
|
||||
# behave similarly for systemtap
|
||||
@@ -76,7 +76,7 @@ Index: node-v18.4.0/tools/install.py
|
||||
|
||||
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
|
||||
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
||||
@@ -162,7 +162,7 @@ def files(action):
|
||||
@@ -194,7 +194,7 @@ def files(action):
|
||||
if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
|
||||
action(['doc/node.1'], 'man/man1/')
|
||||
else:
|
||||
@@ -85,7 +85,7 @@ Index: node-v18.4.0/tools/install.py
|
||||
|
||||
if 'true' == variables.get('node_install_npm'):
|
||||
npm_files(action)
|
||||
@@ -249,28 +249,28 @@ def headers(action):
|
||||
@@ -281,28 +281,28 @@ def headers(action):
|
||||
'src/node_buffer.h',
|
||||
'src/node_object_wrap.h',
|
||||
'src/node_version.h',
|
||||
@@ -122,10 +122,10 @@ Index: node-v18.4.0/tools/install.py
|
||||
|
||||
if sys.platform == 'zos':
|
||||
zoslibinc = os.environ.get('ZOSLIB_INCLUDES')
|
||||
Index: node-v18.4.0/doc/node.1
|
||||
Index: node-v18.7.0/doc/node.1
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/doc/node.1
|
||||
+++ node-v18.4.0/doc/node.1
|
||||
--- node-v18.7.0.orig/doc/node.1
|
||||
+++ node-v18.7.0/doc/node.1
|
||||
@@ -30,24 +30,24 @@
|
||||
.Dt NODE 1
|
||||
.
|
||||
@@ -155,10 +155,10 @@ Index: node-v18.4.0/doc/node.1
|
||||
.Op Fl -v8-options
|
||||
.
|
||||
.\"======================================================================
|
||||
Index: node-v18.4.0/src/node.stp
|
||||
Index: node-v18.7.0/src/node.stp
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/src/node.stp
|
||||
+++ node-v18.4.0/src/node.stp
|
||||
--- node-v18.7.0.orig/src/node.stp
|
||||
+++ node-v18.7.0/src/node.stp
|
||||
@@ -19,7 +19,7 @@
|
||||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
@@ -231,12 +231,12 @@ Index: node-v18.4.0/src/node.stp
|
||||
{
|
||||
scavenge = 1 << 0;
|
||||
compact = 1 << 1;
|
||||
Index: node-v18.4.0/deps/npm/man/man1/npm.1
|
||||
Index: node-v18.7.0/deps/npm/man/man1/npm.1
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/deps/npm/man/man1/npm.1
|
||||
+++ node-v18.4.0/deps/npm/man/man1/npm.1
|
||||
--- node-v18.7.0.orig/deps/npm/man/man1/npm.1
|
||||
+++ node-v18.7.0/deps/npm/man/man1/npm.1
|
||||
@@ -1,6 +1,6 @@
|
||||
.TH "NPM" "1" "June 2022" "" ""
|
||||
.TH "NPM" "1" "July 2022" "" ""
|
||||
.SH "NAME"
|
||||
-\fBnpm\fR \- javascript package manager
|
||||
+\fBnpm18\fR \- javascript package manager
|
||||
@@ -306,10 +306,10 @@ Index: node-v18.4.0/deps/npm/man/man1/npm.1
|
||||
+npm18 help publish
|
||||
|
||||
.RE
|
||||
Index: node-v18.4.0/src/node_main.cc
|
||||
Index: node-v18.7.0/src/node_main.cc
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/src/node_main.cc
|
||||
+++ node-v18.4.0/src/node_main.cc
|
||||
--- node-v18.7.0.orig/src/node_main.cc
|
||||
+++ node-v18.7.0/src/node_main.cc
|
||||
@@ -122,6 +122,7 @@ int main(int argc, char* argv[]) {
|
||||
#endif
|
||||
// Disable stdio buffering, it interacts poorly with printf()
|
||||
@@ -318,11 +318,11 @@ Index: node-v18.4.0/src/node_main.cc
|
||||
setvbuf(stdout, nullptr, _IONBF, 0);
|
||||
setvbuf(stderr, nullptr, _IONBF, 0);
|
||||
return node::Start(argc, argv);
|
||||
Index: node-v18.4.0/tools/test.py
|
||||
Index: node-v18.7.0/tools/test.py
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/tools/test.py
|
||||
+++ node-v18.4.0/tools/test.py
|
||||
@@ -935,7 +935,7 @@ class Context(object):
|
||||
--- node-v18.7.0.orig/tools/test.py
|
||||
+++ node-v18.7.0/tools/test.py
|
||||
@@ -948,7 +948,7 @@ class Context(object):
|
||||
if self.vm is not None:
|
||||
return self.vm
|
||||
if arch == 'none':
|
||||
@@ -331,10 +331,10 @@ Index: node-v18.4.0/tools/test.py
|
||||
else:
|
||||
name = 'out/%s.%s/node' % (arch, mode)
|
||||
|
||||
Index: node-v18.4.0/node.gyp
|
||||
Index: node-v18.7.0/node.gyp
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/node.gyp
|
||||
+++ node-v18.4.0/node.gyp
|
||||
--- node-v18.7.0.orig/node.gyp
|
||||
+++ node-v18.7.0/node.gyp
|
||||
@@ -24,8 +24,8 @@
|
||||
'node_use_openssl%': 'true',
|
||||
'node_shared_openssl%': 'false',
|
||||
@@ -346,10 +346,10 @@ Index: node-v18.4.0/node.gyp
|
||||
'node_intermediate_lib_type%': 'static_library',
|
||||
'node_builtin_modules_path%': '',
|
||||
# We list the deps/ files out instead of globbing them in js2c.py since we
|
||||
Index: node-v18.4.0/deps/npm/man/man1/npx.1
|
||||
Index: node-v18.7.0/deps/npm/man/man1/npx.1
|
||||
===================================================================
|
||||
--- node-v18.4.0.orig/deps/npm/man/man1/npx.1
|
||||
+++ node-v18.4.0/deps/npm/man/man1/npx.1
|
||||
--- node-v18.7.0.orig/deps/npm/man/man1/npx.1
|
||||
+++ node-v18.7.0/deps/npm/man/man1/npx.1
|
||||
@@ -5,10 +5,10 @@
|
||||
.P
|
||||
.RS 2
|
||||
|
Reference in New Issue
Block a user