openpkg-packages/node-v8c/node-v8c.patch

Index: common.gypi
--- common.gypi.orig	2018-01-26 21:25:10.000000000 +0100
+++ common.gypi	2018-01-27 09:50:03.886893000 +0100
@@ -135,7 +135,7 @@
         'variables': {
           'v8_enable_handle_zapping': 0,
         },
-        'cflags': [ '-O3' ],
+        'cflags': [ '-O2' ],
         'conditions': [
           ['target_arch=="x64"', {
             'msvs_configuration_platform': 'x64',
@@ -292,7 +292,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': [
@@ -383,10 +383,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-01-26 21:25:13.000000000 +0100
+++ deps/uv/common.gypi	2018-01-27 09:50:03.887150000 +0100
@@ -46,7 +46,7 @@
       'Release': {
         'defines': [ 'NDEBUG' ],
         'cflags': [
-          '-O3',
+          '-O2',
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
Index: deps/uv/uv.gyp
--- deps/uv/uv.gyp.orig	2018-01-26 21:25:13.000000000 +0100
+++ deps/uv/uv.gyp	2018-01-27 09:50:03.887418000 +0100
@@ -168,7 +168,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-01-26 21:25:13.000000000 +0100
+++ deps/v8/gypfiles/toolchain.gypi	2018-01-27 09:50:03.887865000 +0100
@@ -1080,12 +1080,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)
@@ -1195,8 +1189,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'],
@@ -1313,8 +1307,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-01-26 21:25:14.000000000 +0100
+++ deps/v8/src/base/platform/platform-freebsd.cc	2018-01-27 09:50:03.888087000 +0100
@@ -25,6 +25,7 @@
 #include <strings.h>    // index
 
 #include <cmath>
+#include <cstdio>
 
 #undef MAP_TYPE
 
Index: deps/v8/src/log-utils.cc
--- deps/v8/src/log-utils.cc.orig	2018-01-26 21:25:14.000000000 +0100
+++ deps/v8/src/log-utils.cc	2018-01-27 09:50:03.888412000 +0100
@@ -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 <stdio.h>
+#include <stdlib.h>
+
 #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-01-26 21:25:15.000000000 +0100
+++ deps/v8/src/wasm/wasm-result.cc	2018-01-27 09:50:03.888987000 +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.
 
+#include <cstdarg>
+
 #include "src/wasm/wasm-result.h"
 
 #include "src/factory.h"
Index: lib/dns.js
--- lib/dns.js.orig	2018-01-26 21:25:21.000000000 +0100
+++ lib/dns.js	2018-01-27 09:50:03.889252000 +0100
@@ -184,6 +184,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, errnoException(err, 'getaddrinfo', hostname));
Index: lib/module.js
--- lib/module.js.orig	2018-01-26 21:25:21.000000000 +0100
+++ lib/module.js	2018-01-27 09:50:03.889528000 +0100
@@ -723,7 +723,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-01-26 21:25:22.000000000 +0100
+++ src/inspector_socket_server.cc	2018-01-27 09:50:03.889850000 +0100
@@ -35,7 +35,7 @@
 
 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-01-26 21:25:22.000000000 +0100
+++ src/node_constants.cc	2018-01-27 09:50:03.890176000 +0100
@@ -35,10 +35,10 @@
 #include <limits>
 
 #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
 
Index: src/node_crypto.h
--- src/node_crypto.h.orig	2018-01-26 21:25:22.000000000 +0100
+++ src/node_crypto.h	2018-01-27 09:50:03.890452000 +0100
@@ -36,20 +36,20 @@
 
 #include "v8.h"
 
-#include <openssl/ssl.h>
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
+#include "openssl/ssl.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/err.h>
-#include <openssl/evp.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>
+#include "openssl/err.h"
+#include "openssl/evp.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-01-26 21:25:22.000000000 +0100
+++ src/node_internals.h	2018-01-27 09:50:03.890720000 +0100
@@ -260,6 +260,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-01-26 21:25:22.000000000 +0100
+++ src/tls_wrap.h	2018-01-27 09:50:03.890902000 +0100
@@ -33,7 +33,7 @@
 #include "util.h"
 #include "v8.h"
 
-#include <openssl/ssl.h>
+#include "openssl/ssl.h"
 
 #include <string>
 
Index: src/util.h
--- src/util.h.orig	2018-01-26 21:25:22.000000000 +0100
+++ src/util.h	2018-01-27 09:50:03.891133000 +0100
@@ -84,9 +84,11 @@
 
 template <typename T> using remove_reference = std::remove_reference<T>;
 
+#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;                                        \
@@ -124,13 +126,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()
 
 #define ASSIGN_OR_RETURN_UNWRAP(ptr, obj, ...)                                \
Index: tools/install.py
--- tools/install.py.orig	2018-01-26 21:25:24.000000000 +0100
+++ tools/install.py	2018-01-27 09:50:03.891354000 +0100
@@ -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)