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.
 
 
 
 
 
 

282 lines
8.8 KiB

Index: common.gypi
--- common.gypi.orig 2019-06-20 17:11:29.000000000 +0200
+++ common.gypi 2019-06-20 17:15:51.497677000 +0200
@@ -171,7 +171,7 @@
}],
],
},
- 'cflags': [ '-O3' ],
+ 'cflags': [ '-O2' ],
'conditions': [
['OS=="solaris"', {
# pull in V8's postmortem metadata
@@ -335,7 +335,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' ],
'ldflags': [ '-rdynamic' ],
'target_conditions': [
@@ -437,10 +437,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 2019-06-20 17:11:31.000000000 +0200
+++ deps/uv/common.gypi 2019-06-20 17:15:51.497950000 +0200
@@ -46,7 +46,7 @@
'Release': {
'defines': [ 'NDEBUG' ],
'cflags': [
- '-O3',
+ '-O2',
],
'msvs_settings': {
'VCCLCompilerTool': {
Index: deps/uv/uv.gyp
--- deps/uv/uv.gyp.orig 2019-06-20 17:11:31.000000000 +0200
+++ deps/uv/uv.gyp 2019-06-20 17:15:51.498183000 +0200
@@ -175,7 +175,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 2019-06-20 17:11:31.000000000 +0200
+++ deps/v8/src/base/platform/platform-freebsd.cc 2019-06-20 17:15:51.498371000 +0200
@@ -25,6 +25,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 2019-06-20 17:11:32.000000000 +0200
+++ deps/v8/src/wasm/wasm-result.cc 2019-06-20 17:16:10.389236000 +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 2019-06-20 17:11:33.000000000 +0200
+++ lib/dns.js 2019-06-20 17:16:10.389373000 +0200
@@ -142,6 +142,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 2019-06-20 17:11:33.000000000 +0200
+++ lib/internal/modules/cjs/loader.js 2019-06-20 17:16:10.389594000 +0200
@@ -909,7 +909,10 @@
} else {
prefixDir = path.resolve(process.execPath, '..', '..');
}
- var paths = [path.resolve(prefixDir, 'lib', 'node')];
+ var paths = [
+ path.resolve(prefixDir, '..', 'lib', 'node', 'usr'),
+ path.resolve(prefixDir, '..', 'lib', 'node', 'pkg')
+ ];
if (homeDir) {
paths.unshift(path.resolve(homeDir, '.node_libraries'));
Index: src/inspector_socket_server.cc
--- src/inspector_socket_server.cc.orig 2019-06-20 17:11:33.000000000 +0200
+++ src/inspector_socket_server.cc 2019-06-20 17:16:10.389744000 +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 2019-06-20 17:11:33.000000000 +0200
+++ src/node_constants.cc 2019-06-20 17:16:10.389943000 +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/node_crypto.cc
--- src/node_crypto.cc.orig 2019-06-20 17:11:33.000000000 +0200
+++ src/node_crypto.cc 2019-06-20 17:16:10.390649000 +0200
@@ -38,17 +38,17 @@
#include "util-inl.h"
#include "v8.h"
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
+#include "openssl/ec.h"
+#include "openssl/ecdh.h"
#ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+# include "openssl/engine.h"
#endif // !OPENSSL_NO_ENGINE
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509v3.h>
-#include <openssl/hmac.h>
-#include <openssl/rand.h>
-#include <openssl/pkcs12.h>
+#include "openssl/evp.h"
+#include "openssl/pem.h"
+#include "openssl/x509v3.h"
+#include "openssl/hmac.h"
+#include "openssl/rand.h"
+#include "openssl/pkcs12.h"
#include <cerrno>
#include <climits> // INT_MAX
Index: src/node_crypto.h
--- src/node_crypto.h.orig 2019-06-20 17:11:33.000000000 +0200
+++ src/node_crypto.h 2019-06-20 17:16:10.390819000 +0200
@@ -33,8 +33,8 @@
#include "v8.h"
-#include <openssl/err.h>
-#include <openssl/ssl.h>
+#include "openssl/err.h"
+#include "openssl/ssl.h"
namespace node {
namespace crypto {
Index: src/tls_wrap.h
--- src/tls_wrap.h.orig 2019-06-20 17:11:33.000000000 +0200
+++ src/tls_wrap.h 2019-06-20 17:16:10.390934000 +0200
@@ -31,7 +31,7 @@
#include "stream_wrap.h"
#include "v8.h"
-#include <openssl/ssl.h>
+#include "openssl/ssl.h"
#include <string>
Index: src/util.h
--- src/util.h.orig 2019-06-20 17:11:33.000000000 +0200
+++ src/util.h 2019-06-20 17:16:26.973650000 +0200
@@ -146,14 +146,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
@@ -181,6 +190,7 @@
#endif
+#undef UNREACHABLE
#define UNREACHABLE(...) \
ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__)
Index: tools/install.py
--- tools/install.py.orig 2019-06-20 17:11:33.000000000 +0200
+++ tools/install.py 2019-06-20 17:16:10.391296000 +0200
@@ -151,10 +151,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 2019-06-20 17:11:34.000000000 +0200
+++ tools/v8_gypfiles/toolchain.gypi 2019-06-20 17:16:10.391528000 +0200
@@ -1123,12 +1123,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)
@@ -1296,8 +1290,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'],
@@ -1345,8 +1339,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'],