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.
271 lines
8.8 KiB
271 lines
8.8 KiB
Index: common.gypi |
|
--- common.gypi.orig 2017-05-02 19:07:15.000000000 +0200 |
|
+++ common.gypi 2017-05-03 08:07:21.161178000 +0200 |
|
@@ -272,7 +272,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 19:07:20.000000000 +0200 |
|
+++ deps/uv/uv.gyp 2017-05-03 08:07:21.162022000 +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 19:07:20.000000000 +0200 |
|
+++ deps/v8/build/toolchain.gypi 2017-05-03 08:07:21.164475000 +0200 |
|
@@ -966,12 +966,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 19:07:20.000000000 +0200 |
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2017-05-03 08:07:21.167472000 +0200 |
|
@@ -26,6 +26,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 19:07:22.000000000 +0200 |
|
+++ deps/v8/src/log-utils.cc 2017-05-03 08:07:21.167803000 +0200 |
|
@@ -4,6 +4,9 @@ |
|
|
|
#include "src/v8.h" |
|
|
|
+#include <stdio.h> |
|
+#include <stdlib.h> |
|
+ |
|
#include "src/log-utils.h" |
|
#include "src/string-stream.h" |
|
#include "src/version.h" |
|
Index: deps/v8/src/log-utils.h |
|
--- deps/v8/src/log-utils.h.orig 2017-05-02 19:07:22.000000000 +0200 |
|
+++ deps/v8/src/log-utils.h 2017-05-03 08:07:21.168760000 +0200 |
|
@@ -5,6 +5,7 @@ |
|
#ifndef V8_LOG_UTILS_H_ |
|
#define V8_LOG_UTILS_H_ |
|
|
|
+#include <stdarg.h> |
|
#include "src/allocation.h" |
|
|
|
namespace v8 { |
|
Index: deps/v8/src/runtime/runtime-i18n.cc |
|
--- deps/v8/src/runtime/runtime-i18n.cc.orig 2017-05-02 19:07:23.000000000 +0200 |
|
+++ deps/v8/src/runtime/runtime-i18n.cc 2017-05-03 08:07:21.169935000 +0200 |
|
@@ -33,6 +33,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 19:07:31.000000000 +0200 |
|
+++ deps/v8/tools/gyp/v8.gyp 2017-05-03 08:07:21.173544000 +0200 |
|
@@ -1544,7 +1544,7 @@ |
|
['OS=="freebsd"', { |
|
'link_settings': { |
|
'libraries': [ |
|
- '-L/usr/local/lib -lexecinfo', |
|
+ '-lexecinfo', |
|
]}, |
|
'sources': [ |
|
'../../src/base/platform/platform-freebsd.cc', |
|
@@ -1555,7 +1555,7 @@ |
|
['OS=="openbsd"', { |
|
'link_settings': { |
|
'libraries': [ |
|
- '-L/usr/local/lib -lexecinfo', |
|
+ '-lexecinfo', |
|
]}, |
|
'sources': [ |
|
'../../src/base/platform/platform-openbsd.cc', |
|
@@ -1566,7 +1566,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: lib/dns.js |
|
--- lib/dns.js.orig 2017-05-02 19:07:32.000000000 +0200 |
|
+++ lib/dns.js 2017-05-03 08:07:21.174240000 +0200 |
|
@@ -163,6 +163,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:21.175259000 +0200 |
|
+++ lib/module.js 2017-05-03 23:09:03.756939000 +0200 |
|
@@ -453,16 +453,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/node_crypto.cc |
|
--- src/node_crypto.cc.orig 2017-05-02 19:07:33.000000000 +0200 |
|
+++ src/node_crypto.cc 2017-05-03 08:07:21.211771000 +0200 |
|
@@ -27,6 +27,7 @@ |
|
#include <math.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <cmath> |
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10000000L |
|
#define OPENSSL_CONST const |
|
@@ -5267,7 +5268,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_internals.h |
|
--- src/node_internals.h.orig 2017-05-02 19:07:33.000000000 +0200 |
|
+++ src/node_internals.h 2017-05-03 08:07:21.212045000 +0200 |
|
@@ -120,6 +120,8 @@ |
|
# define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a)) |
|
#endif |
|
|
|
+# undef MUST_USE_RESULT |
|
+# undef NO_RETURN |
|
#if defined(__GNUC__) && __GNUC__ >= 4 |
|
# define MUST_USE_RESULT __attribute__((warn_unused_result)) |
|
# define NO_RETURN __attribute__((noreturn)) |
|
Index: src/util.h |
|
--- src/util.h.orig 2017-05-02 19:07:33.000000000 +0200 |
|
+++ src/util.h 2017-05-03 08:07:21.212270000 +0200 |
|
@@ -33,9 +33,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; \ |
|
@@ -49,6 +51,8 @@ |
|
#define ABORT() abort() |
|
#endif |
|
|
|
+#undef ASSERT |
|
+#undef CHECK |
|
#if defined(NDEBUG) |
|
# define ASSERT(expression) |
|
# define CHECK(expression) \ |
|
@@ -60,6 +64,12 @@ |
|
# define CHECK(expression) assert(expression) |
|
#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)) |
|
@@ -67,13 +77,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 19:07:47.000000000 +0200 |
|
+++ tools/install.py 2017-05-03 08:07:21.212465000 +0200 |
|
@@ -149,10 +149,7 @@ |
|
|
|
action(['deps/v8/tools/gdbinit'], '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) |
|
|
|
|