Update libsnark to our fork.

This commit is contained in:
Sean Bowe
2016-07-15 10:45:09 -06:00
parent fc127fc2db
commit e9f9a73ab7
3 changed files with 4 additions and 60 deletions

View File

@@ -1,19 +0,0 @@
commit 728c1ace30f2338b86331f0b83559409198e1f74
Author: Taylor Hornby <havoc@defuse.ca>
Date: Wed Sep 9 16:46:48 2015 -0600
g++-4.9 requires commas to include the argument to ``rpath`` as a linker flag.
diff --git a/Makefile b/Makefile
index 5f59388..68e91bb 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ DEPSRC = depsrc
DEPINST = depinst
CXXFLAGS += -I$(DEPINST)/include -Isrc
-LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath $(DEPINST)/lib
+LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
LDLIBS += -lgmpxx -lgmp -lboost_program_options
# OpenSSL and its dependencies (needed explicitly for static builds):
LDLIBS += -lcrypto -ldl -lz

View File

@@ -1,31 +0,0 @@
commit c437365ec98ec77754287594d2d3748901d0d176
Author: Taylor Hornby <taylor@defuse.ca>
Date: Wed May 18 10:49:58 2016 -0600
Include header required for std::iota.
diff --git a/src/common/data_structures/integer_permutation.cpp b/src/common/data_structures/integer_permutation.cpp
index f9f9327..378ea7e 100644
--- a/src/common/data_structures/integer_permutation.cpp
+++ b/src/common/data_structures/integer_permutation.cpp
@@ -15,6 +15,7 @@
#include <algorithm>
#include <cassert>
+#include <numeric>
#include <unordered_set>
namespace libsnark {
diff --git a/src/common/data_structures/sparse_vector.tcc b/src/common/data_structures/sparse_vector.tcc
index 26429a5..cfc5d75 100644
--- a/src/common/data_structures/sparse_vector.tcc
+++ b/src/common/data_structures/sparse_vector.tcc
@@ -16,6 +16,8 @@
#include "algebra/scalar_multiplication/multiexp.hpp"
+#include <numeric>
+
namespace libsnark {
template<typename T>