Index: common.gypi --- common.gypi.orig 2018-05-09 03:59:15.000000000 +0200 +++ common.gypi 2018-05-09 08:16:52.487175000 +0200 @@ -163,7 +163,7 @@ 'variables': { 'v8_enable_handle_zapping': 0, }, - 'cflags': [ '-O3' ], + 'cflags': [ '-O2' ], 'conditions': [ ['target_arch=="x64"', { 'msvs_configuration_platform': 'x64', @@ -320,7 +320,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': [ @@ -419,10 +419,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 2018-05-09 03:59:19.000000000 +0200 +++ deps/uv/common.gypi 2018-05-09 08:16:52.487387000 +0200 @@ -46,7 +46,7 @@ 'Release': { 'defines': [ 'NDEBUG' ], 'cflags': [ - '-O3', + '-O2', ], 'msvs_settings': { 'VCCLCompilerTool': { Index: deps/uv/uv.gyp --- deps/uv/uv.gyp.orig 2018-05-09 03:59:19.000000000 +0200 +++ deps/uv/uv.gyp 2018-05-09 08:16:52.487580000 +0200 @@ -173,7 +173,7 @@ 'src/unix/udp.c', ], 'link_settings': { - 'libraries': [ '-lm' ], + 'libraries': [ '-lz', '-lm' ], 'conditions': [ ['OS=="solaris"', { 'ldflags': [ '-pthreads' ], Index: deps/v8/gypfiles/toolchain.gypi --- deps/v8/gypfiles/toolchain.gypi.orig 2018-05-09 03:59:19.000000000 +0200 +++ deps/v8/gypfiles/toolchain.gypi 2018-05-09 08:16:52.487907000 +0200 @@ -1110,12 +1110,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) @@ -1225,8 +1219,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'], @@ -1343,8 +1337,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'], Index: deps/v8/src/base/platform/platform-freebsd.cc --- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-05-09 03:59:19.000000000 +0200 +++ deps/v8/src/base/platform/platform-freebsd.cc 2018-05-09 08:16:52.488074000 +0200 @@ -25,6 +25,7 @@ #include // index #include +#include #undef MAP_TYPE Index: deps/v8/src/log-utils.cc --- deps/v8/src/log-utils.cc.orig 2018-05-09 03:59:21.000000000 +0200 +++ deps/v8/src/log-utils.cc 2018-05-09 08:16:52.488314000 +0200 @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include + #include "src/log-utils.h" #include "src/assert-scope.h" Index: deps/v8/src/wasm/wasm-result.cc --- deps/v8/src/wasm/wasm-result.cc.orig 2018-05-09 03:59:23.000000000 +0200 +++ deps/v8/src/wasm/wasm-result.cc 2018-05-09 08:16:52.488485000 +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 + #include "src/wasm/wasm-result.h" #include "src/factory.h" Index: lib/dns.js --- lib/dns.js.orig 2018-05-09 03:59:34.000000000 +0200 +++ lib/dns.js 2018-05-09 08:16:52.488665000 +0200 @@ -136,6 +136,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); + var err = cares.getaddrinfo(req, hostname, family, hints, verbatim); if (err) { process.nextTick(callback, dnsException(err, 'getaddrinfo', hostname)); Index: lib/internal/modules/cjs/loader.js --- lib/internal/modules/cjs/loader.js.orig 2018-05-09 03:59:35.000000000 +0200 +++ lib/internal/modules/cjs/loader.js 2018-05-09 08:16:52.488931000 +0200 @@ -743,7 +743,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 2018-05-09 03:59:36.000000000 +0200 +++ src/inspector_socket_server.cc 2018-05-09 08:16:52.489170000 +0200 @@ -19,7 +19,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 2018-05-09 03:59:36.000000000 +0200 +++ src/node_constants.cc 2018-05-09 08:16:52.489411000 +0200 @@ -35,10 +35,10 @@ #include #if HAVE_OPENSSL -# include -# include +# include "openssl/ec.h" +# include "openssl/ssl.h" # ifndef OPENSSL_NO_ENGINE -# include +# include "openssl/engine.h" # endif // !OPENSSL_NO_ENGINE #endif Index: src/node_crypto.h --- src/node_crypto.h.orig 2018-05-09 08:16:52.489698000 +0200 +++ src/node_crypto.h 2018-05-09 08:17:54.642477000 +0200 @@ -36,22 +36,22 @@ #include "v8.h" -#include -#include -#include +#include "openssl/ssl.h" +#include "openssl/ec.h" +#include "openssl/ecdh.h" #ifndef OPENSSL_NO_ENGINE -# include +# include "openssl/engine.h" #endif // !OPENSSL_NO_ENGINE -#include -#include +#include "openssl/err.h" +#include "openssl/evp.h" // TODO(shigeki) Remove this after upgrading to 1.1.1 -#include -#include -#include -#include -#include -#include -#include +#include "openssl/obj_mac.h" +#include "openssl/pem.h" +#include "openssl/x509.h" +#include "openssl/x509v3.h" +#include "openssl/hmac.h" +#include "openssl/rand.h" +#include "openssl/pkcs12.h" #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_set_tlsext_status_cb) # define NODE__HAVE_TLSEXT_STATUS_CB Index: src/node_internals.h --- src/node_internals.h.orig 2018-05-09 03:59:37.000000000 +0200 +++ src/node_internals.h 2018-05-09 08:16:52.490040000 +0200 @@ -282,6 +282,7 @@ # define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a)) #endif +# undef MUST_USE_RESULT #ifdef __GNUC__ # define MUST_USE_RESULT __attribute__((warn_unused_result)) #else Index: src/tls_wrap.h --- src/tls_wrap.h.orig 2018-05-09 03:59:38.000000000 +0200 +++ src/tls_wrap.h 2018-05-09 08:16:52.490194000 +0200 @@ -32,7 +32,7 @@ #include "stream_wrap.h" #include "v8.h" -#include +#include "openssl/ssl.h" #include Index: src/util.h --- src/util.h.orig 2018-05-09 03:59:38.000000000 +0200 +++ src/util.h 2018-05-09 08:16:52.490412000 +0200 @@ -83,9 +83,11 @@ NO_RETURN void Assert(const char* const (*args)[4]); void DumpBacktrace(FILE* fp); +#undef FIXED_ONE_BYTE_STRING #define FIXED_ONE_BYTE_STRING(isolate, string) \ (node::OneByteString((isolate), (string), sizeof(string) - 1)) +#undef DISALLOW_COPY_AND_ASSIGN #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ void operator=(const TypeName&) = delete; \ void operator=(TypeName&&) = delete; \ @@ -123,13 +125,20 @@ } \ } 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 UNREACHABLE #define UNREACHABLE() ABORT() // TAILQ-style intrusive list node. Index: tools/install.py --- tools/install.py.orig 2018-05-09 03:59:44.000000000 +0200 +++ tools/install.py 2018-05-09 08:16:52.490585000 +0200 @@ -149,10 +149,7 @@ action(['deps/v8/tools/lldbinit'], '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)