|
|
|
|
@ -1,16 +1,16 @@
|
|
|
|
|
Index: common.gypi
|
|
|
|
|
--- common.gypi.orig 2014-03-11 22:49:48.000000000 +0100
|
|
|
|
|
+++ common.gypi 2014-04-27 17:13:31.536293962 +0200
|
|
|
|
|
@@ -162,7 +162,7 @@
|
|
|
|
|
'ldflags': [ '-pthread' ],
|
|
|
|
|
--- common.gypi.orig 2014-05-02 02:47:47.000000000 +0200
|
|
|
|
|
+++ common.gypi 2014-05-03 17:40:58.669936480 +0200
|
|
|
|
|
@@ -170,7 +170,7 @@
|
|
|
|
|
],
|
|
|
|
|
}],
|
|
|
|
|
[ 'OS in "linux freebsd openbsd solaris android"', {
|
|
|
|
|
- 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
|
|
|
|
|
+ 'cflags': [ '-Wno-unused-parameter', ],
|
|
|
|
|
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
|
|
|
|
|
- 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-pthread', ],
|
|
|
|
|
+ 'cflags': [ '-Wno-unused-parameter', '-pthread', ],
|
|
|
|
|
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
|
|
|
|
|
'ldflags': [ '-rdynamic' ],
|
|
|
|
|
'ldflags': [ '-pthread', '-rdynamic' ],
|
|
|
|
|
'target_conditions': [
|
|
|
|
|
@@ -209,9 +209,6 @@
|
|
|
|
|
@@ -213,9 +213,6 @@
|
|
|
|
|
'-fno-strict-aliasing',
|
|
|
|
|
],
|
|
|
|
|
'WARNING_CFLAGS': [
|
|
|
|
|
@ -21,9 +21,9 @@ Index: common.gypi
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2014-03-11 22:49:48.000000000 +0100
|
|
|
|
|
+++ configure 2014-04-27 17:13:31.536293962 +0200
|
|
|
|
|
@@ -585,9 +585,9 @@
|
|
|
|
|
--- configure.orig 2014-05-02 02:47:47.000000000 +0200
|
|
|
|
|
+++ configure 2014-05-03 17:40:35.839912698 +0200
|
|
|
|
|
@@ -594,9 +594,9 @@
|
|
|
|
|
if options.shared_v8_libpath:
|
|
|
|
|
o['libraries'] += ['-L%s' % options.shared_v8_libpath]
|
|
|
|
|
if options.shared_v8_libname:
|
|
|
|
|
@ -36,8 +36,8 @@ Index: configure
|
|
|
|
|
o['include_dirs'] += [options.shared_v8_includes]
|
|
|
|
|
|
|
|
|
|
Index: deps/npm/lib/build.js
|
|
|
|
|
--- deps/npm/lib/build.js.orig 2014-04-16 00:26:29.000000000 +0200
|
|
|
|
|
+++ deps/npm/lib/build.js 2014-04-27 17:13:31.536293962 +0200
|
|
|
|
|
--- deps/npm/lib/build.js.orig 2014-05-02 01:16:17.000000000 +0200
|
|
|
|
|
+++ deps/npm/lib/build.js 2014-05-03 17:40:35.839912698 +0200
|
|
|
|
|
@@ -202,7 +202,7 @@
|
|
|
|
|
function linkMans (pkg, folder, parent, gtop, cb) {
|
|
|
|
|
if (!pkg.man || !gtop || process.platform === "win32") return cb()
|
|
|
|
|
@ -48,9 +48,9 @@ Index: deps/npm/lib/build.js
|
|
|
|
|
// make sure that the mans are unique.
|
|
|
|
|
// otherwise, if there are dupes, it'll fail with EEXIST
|
|
|
|
|
Index: deps/npm/lib/cache.js
|
|
|
|
|
--- deps/npm/lib/cache.js.orig 2014-04-16 00:26:29.000000000 +0200
|
|
|
|
|
+++ deps/npm/lib/cache.js 2014-04-27 17:14:39.986262094 +0200
|
|
|
|
|
@@ -1061,12 +1061,7 @@
|
|
|
|
|
--- deps/npm/lib/cache.js.orig 2014-05-02 01:16:17.000000000 +0200
|
|
|
|
|
+++ deps/npm/lib/cache.js 2014-05-03 17:40:35.839912698 +0200
|
|
|
|
|
@@ -1085,12 +1085,7 @@
|
|
|
|
|
return cb(er, cacheStat)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -64,7 +64,7 @@ Index: deps/npm/lib/cache.js
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1200,8 +1195,8 @@
|
|
|
|
|
@@ -1224,8 +1219,8 @@
|
|
|
|
|
&& typeof gid === "number"
|
|
|
|
|
&& parseInt(uid, 10) === uid
|
|
|
|
|
&& parseInt(gid, 10) === gid) {
|
|
|
|
|
@ -75,7 +75,7 @@ Index: deps/npm/lib/cache.js
|
|
|
|
|
} else {
|
|
|
|
|
log.verbose("chown", "skip for invalid uid/gid", [f, uid, gid])
|
|
|
|
|
cb()
|
|
|
|
|
@@ -1257,10 +1252,7 @@
|
|
|
|
|
@@ -1281,10 +1276,7 @@
|
|
|
|
|
// a number, then just move on. chown would fail anyway.
|
|
|
|
|
if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) return cb()
|
|
|
|
|
|
|
|
|
|
@ -87,9 +87,9 @@ Index: deps/npm/lib/cache.js
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
Index: lib/module.js
|
|
|
|
|
--- lib/module.js.orig 2014-03-11 22:49:48.000000000 +0100
|
|
|
|
|
+++ lib/module.js 2014-04-27 17:13:31.536293962 +0200
|
|
|
|
|
@@ -501,7 +501,10 @@
|
|
|
|
|
--- lib/module.js.orig 2014-05-02 02:47:47.000000000 +0200
|
|
|
|
|
+++ lib/module.js 2014-05-03 17:40:35.850520817 +0200
|
|
|
|
|
@@ -508,7 +508,10 @@
|
|
|
|
|
var homeDir = process.env.HOME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -102,11 +102,11 @@ Index: lib/module.js
|
|
|
|
|
if (homeDir) {
|
|
|
|
|
paths.unshift(path.resolve(homeDir, '.node_libraries'));
|
|
|
|
|
Index: tools/install.py
|
|
|
|
|
--- tools/install.py.orig 2014-03-11 22:49:48.000000000 +0100
|
|
|
|
|
+++ tools/install.py 2014-04-27 17:13:31.546913316 +0200
|
|
|
|
|
@@ -135,11 +135,6 @@
|
|
|
|
|
# behave similarly for systemtap
|
|
|
|
|
action(['src/node.stp'], 'share/systemtap/tapset/')
|
|
|
|
|
--- tools/install.py.orig 2014-05-02 02:47:47.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2014-05-03 17:40:35.850520817 +0200
|
|
|
|
|
@@ -132,11 +132,6 @@
|
|
|
|
|
if 'true' == variables.get('node_use_dtrace'):
|
|
|
|
|
action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
|
|
|
|
|
|
|
|
|
- if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
|
|
|
|
|
- action(['doc/node.1'], 'man/man1/')
|
|
|
|
|
|