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.
 
 
 
 
 
 

384 lines
12 KiB

Index: common.gypi
--- common.gypi.orig 2017-05-02 18:34:08.000000000 +0200
+++ common.gypi 2017-05-03 08:07:28.393923000 +0200
@@ -271,7 +271,7 @@
'ldflags': [ '-pthread' ],
}],
[ 'OS in "linux freebsd openbsd solaris android aix"', {
- 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
+ 'cflags': [ '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ],
'ldflags': [ '-rdynamic' ],
'target_conditions': [
@@ -362,10 +362,7 @@
'-fno-strict-aliasing',
],
'WARNING_CFLAGS': [
- '-Wall',
- '-Wendif-labels',
- '-W',
- '-Wno-unused-parameter',
+ '-Wno-unused-parameter'
],
},
'target_conditions': [
Index: deps/uv/uv.gyp
--- deps/uv/uv.gyp.orig 2017-05-02 18:34:11.000000000 +0200
+++ deps/uv/uv.gyp 2017-05-03 08:07:28.394202000 +0200
@@ -157,7 +157,7 @@
'src/unix/udp.c',
],
'link_settings': {
- 'libraries': [ '-lm' ],
+ 'libraries': [ '-lz', '-lm' ],
'conditions': [
['OS=="solaris"', {
'ldflags': [ '-pthreads' ],
Index: deps/v8/build/toolchain.gypi
--- deps/v8/build/toolchain.gypi.orig 2017-05-02 18:34:11.000000000 +0200
+++ deps/v8/build/toolchain.gypi 2017-05-03 08:07:28.394608000 +0200
@@ -1074,12 +1074,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)
Index: deps/v8/src/base/platform/platform-freebsd.cc
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-05-02 18:34:12.000000000 +0200
+++ deps/v8/src/base/platform/platform-freebsd.cc 2017-05-03 08:07:28.394847000 +0200
@@ -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 2017-05-02 18:34:13.000000000 +0200
+++ deps/v8/src/log-utils.cc 2017-05-03 08:07:28.395072000 +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 <stdio.h>
+#include <stdlib.h>
+
#include "src/log-utils.h"
#include "src/assert-scope.h"
Index: deps/v8/src/log-utils.h
--- deps/v8/src/log-utils.h.orig 2017-05-02 18:34:13.000000000 +0200
+++ deps/v8/src/log-utils.h 2017-05-03 08:07:28.395273000 +0200
@@ -9,6 +9,7 @@
#include <cstdarg>
+#include <stdarg.h>
#include "src/allocation.h"
#include "src/base/platform/mutex.h"
#include "src/flags.h"
Index: deps/v8/src/runtime/runtime-i18n.cc
--- deps/v8/src/runtime/runtime-i18n.cc.orig 2017-05-02 18:34:13.000000000 +0200
+++ deps/v8/src/runtime/runtime-i18n.cc 2017-05-03 08:07:28.395580000 +0200
@@ -35,6 +35,7 @@
#include "unicode/uloc.h"
#include "unicode/unum.h"
#include "unicode/uversion.h"
+#include "unicode/ustring.h"
namespace v8 {
Index: deps/v8/tools/gyp/v8.gyp
--- deps/v8/tools/gyp/v8.gyp.orig 2017-05-02 18:34:20.000000000 +0200
+++ deps/v8/tools/gyp/v8.gyp 2017-05-03 08:07:28.396186000 +0200
@@ -1827,7 +1827,7 @@
['OS=="freebsd"', {
'link_settings': {
'libraries': [
- '-L/usr/local/lib -lexecinfo',
+ '-lexecinfo',
]},
'sources': [
'../../src/base/platform/platform-freebsd.cc',
@@ -1838,7 +1838,7 @@
['OS=="openbsd"', {
'link_settings': {
'libraries': [
- '-L/usr/local/lib -lexecinfo',
+ '-lexecinfo',
]},
'sources': [
'../../src/base/platform/platform-openbsd.cc',
@@ -1849,7 +1849,7 @@
['OS=="netbsd"', {
'link_settings': {
'libraries': [
- '-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lexecinfo',
+ '-lexecinfo',
]},
'sources': [
'../../src/base/platform/platform-openbsd.cc',
Index: deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template
--- deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template.orig 2017-05-02 18:34:21.000000000 +0200
+++ deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template 2017-05-03 08:07:28.396429000 +0200
@@ -4,6 +4,7 @@
#include <cstdlib>
#include <cstring>
+#include <cstdio>
#include <string>
namespace blink {
@@ -13,22 +14,22 @@
void intToStr(int number, char* buffer, size_t length)
{
- std::snprintf(buffer, length, "%d", number);
+ snprintf(buffer, length, "%d", number);
}
void doubleToStr(double number, char* buffer, size_t length)
{
- std::snprintf(buffer, length, "%f", number);
+ snprintf(buffer, length, "%f", number);
}
void doubleToStr3(double number, char* buffer, size_t length)
{
- std::snprintf(buffer, length, "%.3g", number);
+ snprintf(buffer, length, "%.3g", number);
}
void doubleToStr6(double number, char* buffer, size_t length)
{
- std::snprintf(buffer, length, "%.6g", number);
+ snprintf(buffer, length, "%.6g", number);
}
double strToDouble(const char* buffer, bool* ok)
Index: lib/dns.js
--- lib/dns.js.orig 2017-05-02 18:34:23.000000000 +0200
+++ lib/dns.js 2017-05-03 08:07:28.396678000 +0200
@@ -161,6 +161,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);
if (err) {
callback(errnoException(err, 'getaddrinfo', hostname));
Index: lib/module.js
--- lib/module.js.orig 2017-05-03 08:07:28.397064000 +0200
+++ lib/module.js 2017-05-03 23:09:49.950047000 +0200
@@ -616,16 +616,10 @@
homeDir = process.env.HOME;
}
- // $PREFIX/lib/node, where $PREFIX is the root of the Node.js installation.
- var prefixDir;
- // process.execPath is $PREFIX/bin/node except on Windows where it is
- // $PREFIX\node.exe.
- if (isWindows) {
- prefixDir = path.resolve(process.execPath, '..');
- } else {
- prefixDir = path.resolve(process.execPath, '..', '..');
- }
- var paths = [path.resolve(prefixDir, 'lib', 'node')];
+ var paths = [
+ path.resolve(process.execPath, '..', '..', '..', 'lib', 'node', 'usr'),
+ path.resolve(process.execPath, '..', '..', '..', 'lib', 'node', 'pkg')
+ ];
if (homeDir) {
paths.unshift(path.resolve(homeDir, '.node_libraries'));
Index: src/inspector_agent.cc
--- src/inspector_agent.cc.orig 2017-05-02 18:34:23.000000000 +0200
+++ src/inspector_agent.cc 2017-05-03 08:07:28.397572000 +0200
@@ -34,7 +34,7 @@
const char TAG_CONNECT[] = "#connect";
const char TAG_DISCONNECT[] = "#disconnect";
-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 2017-05-02 18:34:24.000000000 +0200
+++ src/node_constants.cc 2017-05-03 08:07:28.397860000 +0200
@@ -14,10 +14,10 @@
#include <sys/stat.h>
#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.cc
--- src/node_crypto.cc.orig 2017-05-02 18:34:24.000000000 +0200
+++ src/node_crypto.cc 2017-05-03 08:07:28.398787000 +0200
@@ -28,6 +28,8 @@
#include <stdlib.h>
#include <string.h>
+#include <cmath>
+
#define THROW_AND_RETURN_IF_NOT_STRING_OR_BUFFER(val, prefix) \
do { \
if (!Buffer::HasInstance(val) && !val->IsString()) { \
@@ -5414,7 +5416,7 @@
}
raw_keylen = args[3]->NumberValue();
- if (raw_keylen < 0.0 || isnan(raw_keylen) || isinf(raw_keylen) ||
+ if (raw_keylen < 0.0 || std::isnan(raw_keylen) || std::isinf(raw_keylen) ||
raw_keylen > INT_MAX) {
type_error = "Bad key length";
goto err;
Index: src/node_crypto.h
--- src/node_crypto.h.orig 2017-05-02 18:34:24.000000000 +0200
+++ src/node_crypto.h 2017-05-03 08:07:28.399049000 +0200
@@ -17,20 +17,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"
#define EVP_F_EVP_DECRYPTFINAL 101
Index: src/node_internals.h
--- src/node_internals.h.orig 2017-05-02 18:34:24.000000000 +0200
+++ src/node_internals.h 2017-05-03 08:07:28.399244000 +0200
@@ -117,6 +117,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 2017-05-02 18:34:24.000000000 +0200
+++ src/tls_wrap.h 2017-05-03 08:07:28.399428000 +0200
@@ -12,7 +12,7 @@
#include "util.h"
#include "v8.h"
-#include <openssl/ssl.h>
+#include "openssl/ssl.h"
namespace node {
Index: src/util.h
--- src/util.h.orig 2017-05-02 18:34:24.000000000 +0200
+++ src/util.h 2017-05-03 08:07:28.399654000 +0200
@@ -53,9 +53,11 @@
template <typename T> using remove_reference = std::remove_reference<T>;
#endif
+#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; \
@@ -101,12 +103,19 @@
#define CHECK assert
#endif
+#undef ASSERT
#ifdef NDEBUG
#define ASSERT(expr)
#else
#define ASSERT(expr) CHECK(expr)
#endif
+#undef ASSERT_EQ
+#undef ASSERT_GE
+#undef ASSERT_GT
+#undef ASSERT_LE
+#undef ASSERT_LT
+#undef ASSERT_NE
#define ASSERT_EQ(a, b) ASSERT((a) == (b))
#define ASSERT_GE(a, b) ASSERT((a) >= (b))
#define ASSERT_GT(a, b) ASSERT((a) > (b))
@@ -114,13 +123,20 @@
#define ASSERT_LT(a, b) ASSERT((a) < (b))
#define ASSERT_NE(a, b) ASSERT((a) != (b))
+#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 2017-05-02 18:34:27.000000000 +0200
+++ tools/install.py 2017-05-03 08:07:28.399865000 +0200
@@ -136,10 +136,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)