Browse Source

fix building

master
parent
commit
44f6670728
  1. 96
      node/node.patch

96
node/node.patch

@ -1,6 +1,6 @@
Index: common.gypi
--- common.gypi.orig 2019-12-17 08:41:00.000000000 +0100
+++ common.gypi 2019-12-18 11:39:16.750644000 +0100
--- common.gypi.orig 2020-03-05 01:41:42.000000000 +0100
+++ common.gypi 2020-03-05 20:16:39.746403000 +0100
@@ -161,7 +161,7 @@
}],
],
@ -10,16 +10,16 @@ Index: common.gypi
'conditions': [
['OS=="solaris"', {
# pull in V8's postmortem metadata
@@ -331,7 +331,7 @@
@@ -334,7 +334,7 @@
'ldflags': [ '-pthread' ],
}],
[ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
- 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
+ 'cflags': [ '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++1y' ],
'defines': [ '__STDC_FORMAT_MACROS' ],
'ldflags': [ '-rdynamic' ],
'target_conditions': [
@@ -429,10 +429,7 @@
@@ -433,10 +433,7 @@
'-fno-strict-aliasing',
],
'WARNING_CFLAGS': [
@ -32,8 +32,8 @@ Index: common.gypi
},
'target_conditions': [
Index: deps/uv/common.gypi
--- deps/uv/common.gypi.orig 2019-12-17 08:41:01.000000000 +0100
+++ deps/uv/common.gypi 2019-12-18 11:39:16.750940000 +0100
--- deps/uv/common.gypi.orig 2020-03-05 01:41:45.000000000 +0100
+++ deps/uv/common.gypi 2020-03-05 20:16:39.746564000 +0100
@@ -46,7 +46,7 @@
'Release': {
'defines': [ 'NDEBUG' ],
@ -44,8 +44,8 @@ Index: deps/uv/common.gypi
'msvs_settings': {
'VCCLCompilerTool': {
Index: deps/uv/uv.gyp
--- deps/uv/uv.gyp.orig 2019-12-17 08:41:01.000000000 +0100
+++ deps/uv/uv.gyp 2019-12-18 11:39:16.751225000 +0100
--- deps/uv/uv.gyp.orig 2020-03-05 01:41:45.000000000 +0100
+++ deps/uv/uv.gyp 2020-03-05 20:16:39.746719000 +0100
@@ -178,7 +178,7 @@
'src/unix/udp.c',
],
@ -56,9 +56,9 @@ Index: deps/uv/uv.gyp
['OS=="solaris"', {
'ldflags': [ '-pthreads' ],
Index: deps/v8/src/base/platform/platform-freebsd.cc
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2019-12-17 08:41:01.000000000 +0100
+++ deps/v8/src/base/platform/platform-freebsd.cc 2019-12-18 11:39:16.751481000 +0100
@@ -25,6 +25,7 @@
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2020-03-05 01:41:45.000000000 +0100
+++ deps/v8/src/base/platform/platform-freebsd.cc 2020-03-05 20:16:39.746855000 +0100
@@ -27,6 +27,7 @@
#include <strings.h> // index
#include <cmath>
@ -67,8 +67,8 @@ Index: deps/v8/src/base/platform/platform-freebsd.cc
#undef MAP_TYPE
Index: deps/v8/src/builtins/base.tq
--- deps/v8/src/builtins/base.tq.orig 2019-12-17 08:41:01.000000000 +0100
+++ deps/v8/src/builtins/base.tq 2019-12-18 11:39:16.752357000 +0100
--- deps/v8/src/builtins/base.tq.orig 2020-03-05 01:41:45.000000000 +0100
+++ deps/v8/src/builtins/base.tq 2020-03-05 20:16:39.747302000 +0100
@@ -546,9 +546,6 @@
}
@ -119,8 +119,8 @@ Index: deps/v8/src/builtins/base.tq
if (value == V8_INFINITY) {
return true;
Index: deps/v8/src/wasm/wasm-result.cc
--- deps/v8/src/wasm/wasm-result.cc.orig 2019-12-17 08:41:02.000000000 +0100
+++ deps/v8/src/wasm/wasm-result.cc 2019-12-18 11:39:16.752617000 +0100
--- deps/v8/src/wasm/wasm-result.cc.orig 2020-03-05 01:41:45.000000000 +0100
+++ deps/v8/src/wasm/wasm-result.cc 2020-03-05 20:16:39.747441000 +0100
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@ -131,8 +131,8 @@ Index: deps/v8/src/wasm/wasm-result.cc
#include "src/execution/isolate-inl.h"
Index: lib/dns.js
--- lib/dns.js.orig 2019-12-17 08:41:03.000000000 +0100
+++ lib/dns.js 2019-12-18 11:39:16.752882000 +0100
--- lib/dns.js.orig 2020-03-05 01:41:47.000000000 +0100
+++ lib/dns.js 2020-03-05 20:16:39.747589000 +0100
@@ -146,6 +146,10 @@
req.hostname = hostname;
req.oncomplete = all ? onlookupall : onlookup;
@ -145,9 +145,9 @@ Index: lib/dns.js
req, toASCII(hostname), family, hints, verbatim
);
Index: lib/internal/modules/cjs/loader.js
--- lib/internal/modules/cjs/loader.js.orig 2019-12-17 08:41:03.000000000 +0100
+++ lib/internal/modules/cjs/loader.js 2019-12-18 11:39:16.753323000 +0100
@@ -1246,7 +1246,10 @@
--- lib/internal/modules/cjs/loader.js.orig 2020-03-05 01:41:47.000000000 +0100
+++ lib/internal/modules/cjs/loader.js 2020-03-05 20:16:39.747865000 +0100
@@ -1254,7 +1254,10 @@
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');
@ -160,8 +160,8 @@ Index: lib/internal/modules/cjs/loader.js
if (homeDir) {
paths.unshift(path.resolve(homeDir, '.node_libraries'));
Index: src/inspector_socket_server.cc
--- src/inspector_socket_server.cc.orig 2019-12-17 08:41:03.000000000 +0100
+++ src/inspector_socket_server.cc 2019-12-18 11:39:16.753627000 +0100
--- src/inspector_socket_server.cc.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/inspector_socket_server.cc 2020-03-05 20:16:39.748032000 +0100
@@ -20,7 +20,7 @@
bool include_protocol);
namespace {
@ -172,8 +172,8 @@ Index: src/inspector_socket_server.cc
};
Index: src/node_constants.cc
--- src/node_constants.cc.orig 2019-12-17 08:41:03.000000000 +0100
+++ src/node_constants.cc 2019-12-18 11:39:16.753984000 +0100
--- src/node_constants.cc.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/node_constants.cc 2020-03-05 20:16:39.748221000 +0100
@@ -36,10 +36,10 @@
@ -189,9 +189,9 @@ Index: src/node_constants.cc
#endif // HAVE_OPENSSL
Index: src/node_crypto.cc
--- src/node_crypto.cc.orig 2019-12-17 08:41:03.000000000 +0100
+++ src/node_crypto.cc 2019-12-18 11:39:16.755323000 +0100
@@ -38,17 +38,17 @@
--- src/node_crypto.cc.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/node_crypto.cc 2020-03-05 20:16:39.748880000 +0100
@@ -39,17 +39,17 @@
#include "util-inl.h"
#include "v8.h"
@ -219,8 +219,8 @@ Index: src/node_crypto.cc
#include <cerrno>
#include <climits> // INT_MAX
Index: src/node_crypto.h
--- src/node_crypto.h.orig 2019-12-18 11:39:16.755853000 +0100
+++ src/node_crypto.h 2019-12-18 11:44:58.717742000 +0100
--- src/node_crypto.h.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/node_crypto.h 2020-03-05 20:16:39.749074000 +0100
@@ -33,12 +33,12 @@
#include "v8.h"
@ -241,8 +241,8 @@ Index: src/node_crypto.h
namespace node {
namespace crypto {
Index: src/tls_wrap.h
--- src/tls_wrap.h.orig 2019-12-17 08:41:03.000000000 +0100
+++ src/tls_wrap.h 2019-12-18 11:39:16.756335000 +0100
--- src/tls_wrap.h.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/tls_wrap.h 2020-03-05 20:16:39.749210000 +0100
@@ -30,7 +30,7 @@
#include "stream_wrap.h"
#include "v8.h"
@ -252,10 +252,22 @@ Index: src/tls_wrap.h
#include <string>
Index: src/tracing/traced_value.cc
--- src/tracing/traced_value.cc.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/tracing/traced_value.cc 2020-03-05 20:17:08.979263000 +0100
@@ -14,6 +14,8 @@
#include <sstream>
#include <string>
+#include "v8.h"
+
#if defined(_STLP_VENDOR_CSTD)
// STLPort doesn't import fpclassify into the std namespace.
#define FPCLASSIFY_NAMESPACE
Index: src/util.h
--- src/util.h.orig 2019-12-17 08:41:03.000000000 +0100
+++ src/util.h 2019-12-18 11:39:16.756670000 +0100
@@ -152,14 +152,23 @@
--- src/util.h.orig 2020-03-05 01:41:47.000000000 +0100
+++ src/util.h 2020-03-05 20:16:39.749384000 +0100
@@ -159,14 +159,23 @@
} \
} while (0)
@ -279,7 +291,7 @@ Index: src/util.h
#define CHECK_IMPLIES(a, b) CHECK(!(a) || (b))
#ifdef DEBUG
@@ -187,6 +196,7 @@
@@ -194,6 +203,7 @@
#endif
@ -288,8 +300,8 @@ Index: src/util.h
ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__)
Index: tools/install.py
--- tools/install.py.orig 2019-12-17 08:41:04.000000000 +0100
+++ tools/install.py 2019-12-18 11:39:16.756922000 +0100
--- tools/install.py.orig 2020-03-05 01:41:48.000000000 +0100
+++ tools/install.py 2020-03-05 20:16:39.749523000 +0100
@@ -151,10 +151,7 @@
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
@ -303,8 +315,8 @@ Index: tools/install.py
if 'true' == variables.get('node_install_npm'): npm_files(action)
Index: tools/v8_gypfiles/toolchain.gypi
--- tools/v8_gypfiles/toolchain.gypi.orig 2019-12-17 08:41:04.000000000 +0100
+++ tools/v8_gypfiles/toolchain.gypi 2019-12-18 11:39:16.757410000 +0100
--- tools/v8_gypfiles/toolchain.gypi.orig 2020-03-05 01:41:48.000000000 +0100
+++ tools/v8_gypfiles/toolchain.gypi 2020-03-05 20:16:39.749765000 +0100
@@ -1123,12 +1123,6 @@
['OS=="solaris"', {
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
@ -341,8 +353,8 @@ Index: tools/v8_gypfiles/toolchain.gypi
'cflags': ['-O2'],
'cflags!': ['-O3'],
Index: tools/v8_gypfiles/v8.gyp
--- tools/v8_gypfiles/v8.gyp.orig 2019-12-17 08:41:04.000000000 +0100
+++ tools/v8_gypfiles/v8.gyp 2019-12-18 11:39:16.757845000 +0100
--- tools/v8_gypfiles/v8.gyp.orig 2020-03-05 01:41:48.000000000 +0100
+++ tools/v8_gypfiles/v8.gyp 2020-03-05 20:16:39.750007000 +0100
@@ -90,8 +90,7 @@
"<(V8_ROOT)/src/builtins/typed-array-some.tq",
"<(V8_ROOT)/src/builtins/typed-array-subarray.tq",

Loading…
Cancel
Save