You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
226 lines
7.4 KiB
226 lines
7.4 KiB
Index: common.gypi |
|
--- common.gypi.orig 2021-04-20 20:32:59.000000000 +0200 |
|
+++ common.gypi 2021-04-20 20:48:52.199944000 +0200 |
|
@@ -173,7 +173,7 @@ |
|
}], |
|
], |
|
}, |
|
- 'cflags': [ '-O3' ], |
|
+ 'cflags': [ '-O2' ], |
|
'conditions': [ |
|
['OS=="linux"', { |
|
'conditions': [ |
|
@@ -374,7 +374,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' ], |
|
@@ -486,10 +486,7 @@ |
|
'-fno-strict-aliasing', |
|
], |
|
'WARNING_CFLAGS': [ |
|
- '-Wall', |
|
- '-Wendif-labels', |
|
- '-W', |
|
- '-Wno-unused-parameter', |
|
+ '-Wno-unused-parameter' |
|
], |
|
}, |
|
'target_conditions': [ |
|
Index: deps/uv/common.gypi |
|
--- deps/uv/common.gypi.orig 2021-04-20 20:33:01.000000000 +0200 |
|
+++ deps/uv/common.gypi 2021-04-20 20:48:52.200081000 +0200 |
|
@@ -46,7 +46,7 @@ |
|
'Release': { |
|
'defines': [ 'NDEBUG' ], |
|
'cflags': [ |
|
- '-O3', |
|
+ '-O2', |
|
], |
|
'msvs_settings': { |
|
'VCCLCompilerTool': { |
|
Index: deps/uv/uv.gyp |
|
--- deps/uv/uv.gyp.orig 2021-04-20 20:33:01.000000000 +0200 |
|
+++ deps/uv/uv.gyp 2021-04-20 20:48:52.200208000 +0200 |
|
@@ -178,7 +178,7 @@ |
|
'src/unix/udp.c', |
|
], |
|
'link_settings': { |
|
- 'libraries': [ '-lm' ], |
|
+ 'libraries': [ '-lz', '-lm' ], |
|
'conditions': [ |
|
['OS=="solaris"', { |
|
'ldflags': [ '-pthreads' ], |
|
Index: deps/v8/src/base/platform/platform-freebsd.cc |
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2021-04-20 20:33:01.000000000 +0200 |
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2021-04-20 20:48:52.200324000 +0200 |
|
@@ -28,6 +28,7 @@ |
|
#include <strings.h> // index |
|
|
|
#include <cmath> |
|
+#include <cstdio> |
|
|
|
#undef MAP_TYPE |
|
|
|
Index: deps/v8/src/wasm/wasm-result.cc |
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2021-04-20 20:33:01.000000000 +0200 |
|
+++ deps/v8/src/wasm/wasm-result.cc 2021-04-20 20:48:52.200434000 +0200 |
|
@@ -2,6 +2,8 @@ |
|
// Use of this source code is governed by a BSD-style license that can be |
|
// found in the LICENSE file. |
|
|
|
+#include <cstdarg> |
|
+ |
|
#include "src/wasm/wasm-result.h" |
|
|
|
#include "src/execution/isolate-inl.h" |
|
Index: lib/dns.js |
|
--- lib/dns.js.orig 2021-04-20 20:33:06.000000000 +0200 |
|
+++ lib/dns.js 2021-04-20 20:48:52.200557000 +0200 |
|
@@ -150,6 +150,10 @@ |
|
req.hostname = hostname; |
|
req.oncomplete = all ? onlookupall : onlookup; |
|
|
|
+ /* FreeBSD getaddrinfo(3) knows AI_V4MAPPED, but dislikes it */ |
|
+ if (process.platform === "freebsd") |
|
+ hints &= ~(exports.V4MAPPED); |
|
+ |
|
const err = cares.getaddrinfo( |
|
req, toASCII(hostname), family, hints, verbatim |
|
); |
|
Index: lib/internal/modules/cjs/loader.js |
|
--- lib/internal/modules/cjs/loader.js.orig 2021-04-20 20:48:52.200839000 +0200 |
|
+++ lib/internal/modules/cjs/loader.js 2021-04-20 20:51:13.243088000 +0200 |
|
@@ -1218,7 +1218,10 @@ |
|
path.resolve(process.execPath, '..') : |
|
path.resolve(process.execPath, '..', '..'); |
|
|
|
- const paths = [path.resolve(prefixDir, 'lib', 'node')]; |
|
+ let paths = [ |
|
+ path.resolve(prefixDir, '..', 'lib', 'node', 'usr'), |
|
+ path.resolve(prefixDir, '..', 'lib', 'node', 'pkg') |
|
+ ]; |
|
|
|
if (homeDir) { |
|
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); |
|
Index: src/inspector_socket_server.cc |
|
--- src/inspector_socket_server.cc.orig 2021-04-20 20:33:06.000000000 +0200 |
|
+++ src/inspector_socket_server.cc 2021-04-20 20:48:52.201054000 +0200 |
|
@@ -20,7 +20,7 @@ |
|
bool include_protocol); |
|
namespace { |
|
|
|
-static const uint8_t PROTOCOL_JSON[] = { |
|
+static uint8_t PROTOCOL_JSON[] = { |
|
#include "v8_inspector_protocol_json.h" // NOLINT(build/include_order) |
|
}; |
|
|
|
Index: src/node_constants.cc |
|
--- src/node_constants.cc.orig 2021-04-20 20:33:06.000000000 +0200 |
|
+++ src/node_constants.cc 2021-04-20 20:48:52.201219000 +0200 |
|
@@ -36,10 +36,10 @@ |
|
|
|
|
|
#if HAVE_OPENSSL |
|
-#include <openssl/ec.h> |
|
-#include <openssl/ssl.h> |
|
+#include "openssl/ec.h" |
|
+#include "openssl/ssl.h" |
|
#ifndef OPENSSL_NO_ENGINE |
|
-#include <openssl/engine.h> |
|
+#include "openssl/engine.h" |
|
#endif // !OPENSSL_NO_ENGINE |
|
#endif // HAVE_OPENSSL |
|
|
|
Index: src/util.h |
|
--- src/util.h.orig 2021-04-20 20:33:06.000000000 +0200 |
|
+++ src/util.h 2021-04-20 20:48:52.201373000 +0200 |
|
@@ -150,14 +150,23 @@ |
|
} \ |
|
} while (0) |
|
|
|
+#undef CHECK_EQ |
|
#define CHECK_EQ(a, b) CHECK((a) == (b)) |
|
+#undef CHECK_GE |
|
#define CHECK_GE(a, b) CHECK((a) >= (b)) |
|
+#undef CHECK_GT |
|
#define CHECK_GT(a, b) CHECK((a) > (b)) |
|
+#undef CHECK_LE |
|
#define CHECK_LE(a, b) CHECK((a) <= (b)) |
|
+#undef CHECK_LT |
|
#define CHECK_LT(a, b) CHECK((a) < (b)) |
|
+#undef CHECK_NE |
|
#define CHECK_NE(a, b) CHECK((a) != (b)) |
|
+#undef CHECK_NULL |
|
#define CHECK_NULL(val) CHECK((val) == nullptr) |
|
+#undef CHECK_NOT_NULL |
|
#define CHECK_NOT_NULL(val) CHECK((val) != nullptr) |
|
+#undef CHECK_IMPLIES |
|
#define CHECK_IMPLIES(a, b) CHECK(!(a) || (b)) |
|
|
|
#ifdef DEBUG |
|
@@ -185,6 +194,7 @@ |
|
#endif |
|
|
|
|
|
+#undef UNREACHABLE |
|
#define UNREACHABLE(...) \ |
|
ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__) |
|
|
|
Index: tools/install.py |
|
--- tools/install.py.orig 2021-04-20 20:33:07.000000000 +0200 |
|
+++ tools/install.py 2021-04-20 20:48:52.201492000 +0200 |
|
@@ -147,10 +147,7 @@ |
|
action(['deps/v8/tools/gdbinit'], 'share/doc/node/') |
|
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/') |
|
|
|
- if 'freebsd' in sys.platform or 'openbsd' in sys.platform: |
|
- action(['doc/node.1'], 'man/man1/') |
|
- else: |
|
- action(['doc/node.1'], 'share/man/man1/') |
|
+ action(['doc/node.1'], 'man/man1/') |
|
|
|
if 'true' == variables.get('node_install_npm'): npm_files(action) |
|
|
|
Index: tools/v8_gypfiles/toolchain.gypi |
|
--- tools/v8_gypfiles/toolchain.gypi.orig 2021-04-20 20:33:08.000000000 +0200 |
|
+++ tools/v8_gypfiles/toolchain.gypi 2021-04-20 20:48:52.201713000 +0200 |
|
@@ -1087,12 +1087,6 @@ |
|
['OS=="solaris"', { |
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc. |
|
}], |
|
- ['OS=="freebsd" or OS=="openbsd"', { |
|
- 'cflags': [ '-I/usr/local/include' ], |
|
- }], |
|
- ['OS=="netbsd"', { |
|
- 'cflags': [ '-I/usr/pkg/include' ], |
|
- }], |
|
['OS=="aix"', { |
|
'defines': [ |
|
# Support for malloc(0) |
|
@@ -1235,8 +1229,8 @@ |
|
# Don't use -O3 with sanitizers. |
|
['asan==0 and msan==0 and lsan==0 \ |
|
and tsan==0 and ubsan==0 and ubsan_vptr==0', { |
|
- 'cflags': ['-O3'], |
|
- 'cflags!': ['-O2'], |
|
+ 'cflags': ['-O2'], |
|
+ 'cflags!': ['-O3'], |
|
}, { |
|
'cflags': ['-O2'], |
|
'cflags!': ['-O3'], |
|
@@ -1283,8 +1277,8 @@ |
|
# Don't use -O3 with sanitizers. |
|
['asan==0 and msan==0 and lsan==0 \ |
|
and tsan==0 and ubsan==0 and ubsan_vptr==0', { |
|
- 'cflags': ['-O3'], |
|
- 'cflags!': ['-O2'], |
|
+ 'cflags': ['-O2'], |
|
+ 'cflags!': ['-O3'], |
|
}, { |
|
'cflags': ['-O2'], |
|
'cflags!': ['-O3'],
|
|
|