[arch-commits] Commit in zcash/trunk (3 files)

[Nicola Squartini]

    Date: Friday, March 16, 2018 @ 08:45:30
  Author: tensor5
Revision: 308799

upgpkg: zcash 1.0.15-1

Added:
  zcash/trunk/libsnark-no-gtest.patch
Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/boost-no-mt-suffix.patch

--------------------------+
 PKGBUILD                 |   22 +++++++++++++---------
 boost-no-mt-suffix.patch |   11 +++++++++++
 libsnark-no-gtest.patch  |   22 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-16 08:45:07 UTC (rev 308798)
+++ PKGBUILD	2018-03-16 08:45:30 UTC (rev 308799)
@@ -2,22 +2,24 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=zcash
-pkgver=1.0.14
-_commit=1ddecf644f6bab29545bb6333889fb059eb7970e
-pkgrel=2
+pkgver=1.0.15
+_commit=93332d6e84590cdcb8c64282f9b525152c3f1b2f
+pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
 license=('MIT')
-depends=('boost-libs' 'libevent' 'zeromq')
+depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq')
 makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget')
 checkdepends=('python' 'python2' 'python2-pyzmq')
 source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"
         "boost-no-mt-suffix.patch"
+        'libsnark-no-gtest.patch'
         "use-system-rust.patch"
         'zcashd.service')
 sha512sums=('SKIP'
-            'fa9ac59839ba6c6aabefb24296ae29914acf7089487377e7948fd684e32b1b499e8e15daccd10baf968905ec69ad2da8b91ff2c8d4724412d8143428ed4de23d'
+            '7019ef6162be0083db7399ec2ec3059b669b4f05247d6f038603ba3541a864d180ca41d5d971993f0d9c028410f811f31a31c39faa7c62cbad23ca65a4a4662c'
+            'ba59e6f94ac7fa94429203e32b9804e6d741e60099e2dd052813ed879ad5a10c46e816dc8d4a5d59444c35c7eaf9a40434fd93b7e392fd535c041c89274375f0'
             '3663373af04318aa72d877f399f0c9e956d289ac876583e70afa2933bf4171f7441a399e043b2d29b1df6d19d29390bb69d4053cad4b75bef903a8685fcd23bf'
             '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
@@ -28,6 +30,7 @@
     git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
 
     patch -Np1 -i ../boost-no-mt-suffix.patch
+    patch -Np1 -i ../libsnark-no-gtest.patch
     patch -Np1 -i ../use-system-rust.patch
 }
 
@@ -37,14 +40,15 @@
     cd depends
     make install \
         native_packages='' \
-        packages='bdb librustzcash proton'
+        packages='bdb librustzcash'
     cd ..
 
-    CPPFLAGS="${CPPFLAGS} -I$PWD/depends/${CARCH}-unknown-linux-gnu/include"
-    LDFLAGS="${LDFLAGS} -L${PWD}/depends/${CARCH}-unknown-linux-gnu/lib -L${PWD}/depends/x86_64-unknown-linux-gnu/lib64"
+    BUILD="$(./depends/config.guess)"
+    CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include"
+    LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib"
 
     ./autogen.sh
-    depends_prefix="${PWD}/depends/x86_64-unknown-linux-gnu" ./configure --prefix=/usr
+    depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr
     make
 }
 

Modified: boost-no-mt-suffix.patch
===================================================================
--- boost-no-mt-suffix.patch	2018-03-16 08:45:07 UTC (rev 308798)
+++ boost-no-mt-suffix.patch	2018-03-16 08:45:30 UTC (rev 308799)
@@ -9,3 +9,14 @@
  
  AC_MSG_CHECKING([whether to build bitcoind])
  AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+--- a/src/snark/Makefile
++++ b/src/snark/Makefile
+@@ -19,7 +19,7 @@ DEPINST = depinst
+ 
+ CXXFLAGS += -I$(DEPINST)/include -Ilibsnark
+ LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
+-LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium
++LDLIBS += -lgmpxx -lgmp -lboost_program_options -lsodium
+ # List of .a files to include within libsnark.a and libsnark.so:
+ AR_LIBS =
+ # List of library files to install:

Added: libsnark-no-gtest.patch
===================================================================
--- libsnark-no-gtest.patch	                        (rev 0)
+++ libsnark-no-gtest.patch	2018-03-16 08:45:30 UTC (rev 308799)
@@ -0,0 +1,22 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+ 
+ LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all
+-LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
++LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 NO_GTEST=1
+ if HAVE_OPENMP
+ LIBSNARK_CONFIG_FLAGS += MULTICORE=1
+ endif
+--- a/src/snark/Makefile
++++ b/src/snark/Makefile
+@@ -172,7 +172,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL
+ GTEST_OBJS =$(patsubst %.cpp,%.o,$(GTEST_SRCS))
+ 
+ all: \
+-     $(if $(NO_GTEST),,$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \
++     $(if $(NO_GTEST),$(LIBSNARK_A),$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \
+      $(if $(NO_SUPERCOP),,$(EXECUTABLES_WITH_SUPERCOP)) \
+      $(EXECUTABLES) \
+      $(if $(NO_DOCS),,doc)