Browse Source
Pass correct dependencies path to libsnark from both Gitian and build.sh
pull/4/head
Jack Grigg
7 years ago
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
2 changed files with
11 additions and
3 deletions
-
configure.ac
-
src/Makefile.am
|
|
|
@ -762,6 +762,14 @@ if test x$enable_rust != xno; then |
|
|
|
RUST_LIBS="-lrustzcash" |
|
|
|
fi |
|
|
|
|
|
|
|
# Gitian uses a config.site that sets depends_prefix, and then sets --prefix=/ |
|
|
|
# build.sh just uses --prefix |
|
|
|
if test x$depends_prefix != x; then |
|
|
|
LIBSNARK_DEPINST="$depends_prefix" |
|
|
|
else |
|
|
|
LIBSNARK_DEPINST="$prefix" |
|
|
|
fi |
|
|
|
|
|
|
|
LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp $RUST_LIBS" |
|
|
|
|
|
|
|
CXXFLAGS_TEMP="$CXXFLAGS" |
|
|
|
@ -897,7 +905,7 @@ AC_SUBST(TESTDEFS) |
|
|
|
AC_SUBST(LEVELDB_TARGET_FLAGS) |
|
|
|
AC_SUBST(GMP_LIBS) |
|
|
|
AC_SUBST(GMPXX_LIBS) |
|
|
|
AC_SUBST(LIBSNARK_LIBS) |
|
|
|
AC_SUBST(LIBSNARK_DEPINST) |
|
|
|
AC_SUBST(LIBZCASH_LIBS) |
|
|
|
AC_SUBST(PROTON_LIBS) |
|
|
|
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi src/test/buildenv.py]) |
|
|
|
|
|
|
|
@ -49,10 +49,10 @@ LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 |
|
|
|
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 |
|
|
|
|
|
|
|
$(LIBSNARK): $(wildcard snark/src/*) |
|
|
|
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST=$(prefix) $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" |
|
|
|
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" |
|
|
|
|
|
|
|
libsnark-tests: $(wildcard snark/src/*) |
|
|
|
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check PREFIX=$(srcdir)/build DEPINST=$(prefix) $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" |
|
|
|
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" |
|
|
|
|
|
|
|
$(LIBUNIVALUE): $(wildcard univalue/lib/*) |
|
|
|
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/ |
|
|
|
|
