diff --git a/cjdns.dyn.patch b/cjdns.dyn.patch index dc5062d..9dc22e0 100644 --- a/cjdns.dyn.patch +++ b/cjdns.dyn.patch @@ -1,13 +1,16 @@ diff -up ./node_build/make.js.dyn ./node_build/make.js ---- ./node_build/make.js.dyn 2016-01-27 03:07:49.000000000 -0500 -+++ ./node_build/make.js 2016-04-18 16:17:04.052719207 -0400 -@@ -250,41 +250,9 @@ Builder.configure({ +--- ./node_build/make.js.dyn 2016-10-11 17:39:44.000000000 -0400 ++++ ./node_build/make.js 2016-10-14 22:08:23.018241766 -0400 +@@ -252,44 +252,9 @@ Builder.configure({ }).nThen(function (waitFor) { - builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a'); - builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include/'); - +- // needed for Sign.c which pulls in crypto_int32.h +- builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include_internal/'); +- - Fs.exists(dependencyDir + '/cnacl/jsbuild/libnacl.a', waitFor(function (exists) { - if (exists) { return; } - @@ -46,7 +49,7 @@ diff -up ./node_build/make.js.dyn ./node_build/make.js }).nThen(function (waitFor) { -@@ -423,7 +391,7 @@ Builder.configure({ +@@ -430,7 +395,7 @@ Builder.configure({ builder.buildExecutable('crypto/random/randombytes.c'); builder.lintFiles(function (fileName, file, callback) { diff --git a/cjdns.sodium.patch b/cjdns.sodium.patch index f166608..7c637a8 100644 --- a/cjdns.sodium.patch +++ b/cjdns.sodium.patch @@ -1,7 +1,7 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js --- ./node_build/make.js.sodium 2016-10-11 17:39:44.000000000 -0400 -+++ ./node_build/make.js 2016-10-12 14:03:53.289124583 -0400 -@@ -252,44 +252,9 @@ Builder.configure({ ++++ ./node_build/make.js 2016-10-14 22:23:23.711086438 -0400 +@@ -252,44 +252,8 @@ Builder.configure({ }).nThen(function (waitFor) { @@ -44,12 +44,11 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js - })); - })); + builder.config.libs.push('-lsodium'); -+ builder.config.libs.push('-lstdc++'); + builder.config.includeDirs.push('/usr/include/sodium/'); }).nThen(function (waitFor) { -@@ -430,7 +395,7 @@ Builder.configure({ +@@ -430,7 +394,7 @@ Builder.configure({ builder.buildExecutable('crypto/random/randombytes.c'); builder.lintFiles(function (fileName, file, callback) {