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

[Nicola Squartini]

    Date: Tuesday, March 28, 2017 @ 14:51:10
  Author: tensor5
Revision: 219730

upgpkg: zcash 1.0.8-1

Added:
  zcash/trunk/use-system-rust.patch
Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/boost-no-mt-suffix.patch

--------------------------+
 PKGBUILD                 |   21 ++++++++++++---------
 boost-no-mt-suffix.patch |   10 +++++-----
 use-system-rust.patch    |   10 ++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-28 13:54:11 UTC (rev 219729)
+++ PKGBUILD	2017-03-28 14:51:10 UTC (rev 219730)
@@ -2,21 +2,23 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=zcash
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
 license=('MIT')
-depends=('boost-libs' 'miniupnpc' 'zeromq')
-makedepends=('boost' 'wget')
+depends=('boost-libs' 'libevent' 'miniupnpc' 'zeromq')
+makedepends=('boost' 'cargo' 'wget')
 checkdepends=('python' 'python2' 'python2-pyzmq')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/zcash/zcash/archive/v${pkgver}.tar.gz"
         "boost-no-mt-suffix.patch"
-        "use-system-libraries.patch")
-sha256sums=('6254709ed0df4b635759158c46313206ab1d3ba6f96db0de94883223063c6ce4'
-            '19c1a2f5f6623977c740322b0eb104766c72c5690fcf2bfefab956c81e80e583'
-            'ef8ab26635bb2608f03ddf991da3581060670161938171fa2e413758fa4bad3f')
+        "use-system-libraries.patch"
+        "use-system-rust.patch")
+sha256sums=('a7d7cf893821c2f01d611e285774db807c98281d795e17e169fc850f72402cf0'
+            'c318e12a9d48a50cf254d2a58c24dd0cbbf1dc969e3afeecadd0756425ea5b07'
+            'ef8ab26635bb2608f03ddf991da3581060670161938171fa2e413758fa4bad3f'
+            '065cd418ca7be72018c7fdada3012872bd079a254a95560312514594381b8028')
 
 prepare() {
     cd ${pkgname}-${pkgver}
@@ -23,6 +25,7 @@
 
     patch -Np1 -i ../boost-no-mt-suffix.patch
     patch -Np1 -i ../use-system-libraries.patch
+    patch -Np1 -i ../use-system-rust.patch
 }
 
 build() {
@@ -29,7 +32,7 @@
     cd ${pkgname}-${pkgver}
 
     cd depends
-    libs=('bdb' 'googletest' 'googlemock' 'libsnark' 'openssl')
+    libs=('bdb' 'googletest' 'googlemock' 'librustzcash' 'libsnark' 'openssl')
     for lib in "${libs[@]}"; do
         make ${lib}
     done
@@ -43,7 +46,7 @@
     LDFLAGS="${LDFLAGS} -L${PWD}/depends/x86_64-unknown-linux-gnu/lib"
 
     ./autogen.sh
-    ./configure --prefix=/usr --with-gui=no
+    ./configure --prefix=/usr
     make
 }
 

Modified: boost-no-mt-suffix.patch
===================================================================
--- boost-no-mt-suffix.patch	2017-03-28 13:54:11 UTC (rev 219729)
+++ boost-no-mt-suffix.patch	2017-03-28 14:51:10 UTC (rev 219730)
@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -782,7 +782,7 @@
- AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing))
- AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx])
+@@ -776,7 +776,7 @@
+   RUST_LIBS="-lrustzcash"
+ fi
  
--LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp"
-+LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system -lcrypto -lsodium -fopenmp"
+-LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp $RUST_LIBS"
++LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system -lcrypto -lsodium -fopenmp $RUST_LIBS"
  
  CXXFLAGS_TEMP="$CXXFLAGS"
  LIBS_TEMP="$LIBS"

Added: use-system-rust.patch
===================================================================
--- use-system-rust.patch	                        (rev 0)
+++ use-system-rust.patch	2017-03-28 14:51:10 UTC (rev 219730)
@@ -0,0 +1,10 @@
+--- a/depends/packages/librustzcash.mk
++++ b/depends/packages/librustzcash.mk
+@@ -5,7 +5,6 @@
+ $(package)_download_file=$($(package)_git_commit).tar.gz
+ $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279
+ $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e
+-$(package)_dependencies=rust
+ 
+ define $(package)_build_cmds
+   cargo build --release