58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
|
diff -up ./node_build/make.js.dyn ./node_build/make.js
|
||
|
|
--- ./node_build/make.js.dyn 2015-11-02 17:59:41.000000000 -0500
|
||
|
|
+++ ./node_build/make.js 2015-11-04 19:57:49.961155943 -0500
|
||
|
|
@@ -238,41 +238,9 @@ Builder.configure({
|
||
|
|
|
||
|
|
}).nThen(function (waitFor) {
|
||
|
|
|
||
|
|
- builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a');
|
||
|
|
- builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include/');
|
||
|
|
-
|
||
|
|
- Fs.exists(dependencyDir + '/cnacl/jsbuild/libnacl.a', waitFor(function (exists) {
|
||
|
|
- if (exists) { return; }
|
||
|
|
-
|
||
|
|
- console.log("Build NaCl");
|
||
|
|
- var cwd = process.cwd();
|
||
|
|
- process.chdir(dependencyDir + '/cnacl/');
|
||
|
|
-
|
||
|
|
- var NaCl = require(process.cwd() + '/node_build/make.js');
|
||
|
|
- NaCl.build(function (args, callback) {
|
||
|
|
- if (builder.config.systemName !== 'win32') {
|
||
|
|
- args.unshift('-fPIC');
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- args.unshift(builder.config.optimizeLevel, '-fomit-frame-pointer');
|
||
|
|
-
|
||
|
|
- if (CFLAGS) {
|
||
|
|
- [].push.apply(args, CFLAGS.split(' '));
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- if (!builder.config.crossCompiling) {
|
||
|
|
- if (NO_MARCH_FLAG.indexOf(process.arch) < -1) {
|
||
|
|
- builder.config.cflags.push('-march=native');
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- builder.cc(args, callback);
|
||
|
|
- },
|
||
|
|
- builder.config,
|
||
|
|
- waitFor(function () {
|
||
|
|
- process.chdir(cwd);
|
||
|
|
- }));
|
||
|
|
- }));
|
||
|
|
+ builder.config.libs.push('-lsodium');
|
||
|
|
+ builder.config.libs.push('-lstdc++');
|
||
|
|
+ builder.config.includeDirs.push('/usr/include/sodium/');
|
||
|
|
|
||
|
|
}).nThen(function (waitFor) {
|
||
|
|
|
||
|
|
@@ -411,7 +379,7 @@ Builder.configure({
|
||
|
|
builder.buildExecutable('crypto/random/randombytes.c');
|
||
|
|
|
||
|
|
builder.lintFiles(function (fileName, file, callback) {
|
||
|
|
- if (/dependencies/.test(fileName)) {
|
||
|
|
+ if (/(dependencies|\/usr\/include)/.test(fileName)) {
|
||
|
|
callback('', false);
|
||
|
|
return;
|
||
|
|
}
|