Merge branch 'master' into f23
This commit is contained in:
commit
d57610df8c
@ -1,13 +1,16 @@
|
|||||||
diff -up ./node_build/make.js.dyn ./node_build/make.js
|
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.dyn 2016-10-11 17:39:44.000000000 -0400
|
||||||
+++ ./node_build/make.js 2016-04-18 16:17:04.052719207 -0400
|
+++ ./node_build/make.js 2016-10-14 22:08:23.018241766 -0400
|
||||||
@@ -250,41 +250,9 @@ Builder.configure({
|
@@ -252,44 +252,9 @@ Builder.configure({
|
||||||
|
|
||||||
}).nThen(function (waitFor) {
|
}).nThen(function (waitFor) {
|
||||||
|
|
||||||
- builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a');
|
- builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a');
|
||||||
- builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include/');
|
- 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) {
|
- Fs.exists(dependencyDir + '/cnacl/jsbuild/libnacl.a', waitFor(function (exists) {
|
||||||
- if (exists) { return; }
|
- if (exists) { return; }
|
||||||
-
|
-
|
||||||
@ -46,7 +49,7 @@ diff -up ./node_build/make.js.dyn ./node_build/make.js
|
|||||||
|
|
||||||
}).nThen(function (waitFor) {
|
}).nThen(function (waitFor) {
|
||||||
|
|
||||||
@@ -423,7 +391,7 @@ Builder.configure({
|
@@ -430,7 +395,7 @@ Builder.configure({
|
||||||
builder.buildExecutable('crypto/random/randombytes.c');
|
builder.buildExecutable('crypto/random/randombytes.c');
|
||||||
|
|
||||||
builder.lintFiles(function (fileName, file, callback) {
|
builder.lintFiles(function (fileName, file, callback) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -up ./node_build/make.js.sodium ./node_build/make.js
|
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.sodium 2016-10-11 17:39:44.000000000 -0400
|
||||||
+++ ./node_build/make.js 2016-10-12 14:03:53.289124583 -0400
|
+++ ./node_build/make.js 2016-10-14 22:23:23.711086438 -0400
|
||||||
@@ -252,44 +252,9 @@ Builder.configure({
|
@@ -252,44 +252,8 @@ Builder.configure({
|
||||||
|
|
||||||
}).nThen(function (waitFor) {
|
}).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('-lsodium');
|
||||||
+ builder.config.libs.push('-lstdc++');
|
|
||||||
+ builder.config.includeDirs.push('/usr/include/sodium/');
|
+ builder.config.includeDirs.push('/usr/include/sodium/');
|
||||||
|
|
||||||
}).nThen(function (waitFor) {
|
}).nThen(function (waitFor) {
|
||||||
|
|
||||||
@@ -430,7 +395,7 @@ Builder.configure({
|
@@ -430,7 +394,7 @@ Builder.configure({
|
||||||
builder.buildExecutable('crypto/random/randombytes.c');
|
builder.buildExecutable('crypto/random/randombytes.c');
|
||||||
|
|
||||||
builder.lintFiles(function (fileName, file, callback) {
|
builder.lintFiles(function (fileName, file, callback) {
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
Name: cjdns
|
Name: cjdns
|
||||||
# major version is cjdns protocol version:
|
# major version is cjdns protocol version:
|
||||||
Version: 18
|
Version: 18
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: The privacy-friendly network without borders
|
Summary: The privacy-friendly network without borders
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
|
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
|
||||||
@ -482,6 +482,9 @@ fi
|
|||||||
%{_bindir}/graphStats
|
%{_bindir}/graphStats
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 14 2016 Stuart D. Gathman <stuart@gathman.org> 18-3
|
||||||
|
- libstdc++ not needed with libsodium
|
||||||
|
|
||||||
* Fri Oct 14 2016 Stuart D. Gathman <stuart@gathman.org> 18-2
|
* Fri Oct 14 2016 Stuart D. Gathman <stuart@gathman.org> 18-2
|
||||||
- Remove Sign.c which uses a private API and isn't needed until supernodes.
|
- Remove Sign.c which uses a private API and isn't needed until supernodes.
|
||||||
- Use libsodium by default: seems best performance of dynamic libraries
|
- Use libsodium by default: seems best performance of dynamic libraries
|
||||||
|
Loading…
Reference in New Issue
Block a user