[arch-commits] Commit in zcash/trunk (PKGBUILD boost-no-mt-suffix.patch)

[Nicola Squartini]

    Date: Wednesday, November 22, 2017 @ 14:32:00
  Author: tensor5
Revision: 268035

upgpkg: zcash 1.0.13-1

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

--------------------------+
 PKGBUILD                 |   39 +++++++++++++--------------------------
 boost-no-mt-suffix.patch |    8 ++++----
 2 files changed, 17 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-22 14:30:03 UTC (rev 268034)
+++ PKGBUILD	2017-11-22 14:32:00 UTC (rev 268035)
@@ -2,9 +2,9 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=zcash
-pkgver=1.0.12
-_commit=b86b9feb6c3c1727cc3992da2f95c4a4f09a982b
-pkgrel=2
+pkgver=1.0.13
+_commit=3ee1d04a8dff26e81aaf17095a0e2472bc70cf36
+pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
@@ -14,11 +14,9 @@
 checkdepends=('python' 'python2' 'python2-pyzmq')
 source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"
         "boost-no-mt-suffix.patch"
-        "use-system-libraries.patch"
         "use-system-rust.patch")
 sha256sums=('SKIP'
-            '15389fe2741b8641d39b9fc0cd155e919d09e6d9317b79d0f4f1bcefb798766c'
-            'ef8ab26635bb2608f03ddf991da3581060670161938171fa2e413758fa4bad3f'
+            'de84cf8c0ee530958300bcd9d92c59f5adb5ccabcf7fbc79ace856b0461d394c'
             '065cd418ca7be72018c7fdada3012872bd079a254a95560312514594381b8028')
 
 prepare() {
@@ -25,27 +23,19 @@
     cd ${pkgname}
 
     # Set gitattributes on src/clientversion.cpp
-    mkdir ../${pkgname}-${pkgver}
-    git archive ${_commit} | tar -xC ../${pkgname}-${pkgver}
-    cd ../${pkgname}-${pkgver}
+    git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
 
     patch -Np1 -i ../boost-no-mt-suffix.patch
-    patch -Np1 -i ../use-system-libraries.patch
     patch -Np1 -i ../use-system-rust.patch
 }
 
 build() {
-    cd ${pkgname}-${pkgver}
+    cd ${pkgname}
 
     cd depends
-    libs=('bdb' 'googletest' 'googlemock' 'librustzcash' 'libsnark' 'proton')
-    for lib in "${libs[@]}"; do
-        make ${lib}
-    done
-    for lib in "${libs[@]}"; do
-        tar -xzf built/${CARCH}-unknown-linux-gnu/${lib}/${lib}-*.tar.gz \
-            -C ${CARCH}-unknown-linux-gnu
-    done
+    make install \
+        native_packages='' \
+        packages='bdb googletest googlemock librustzcash proton'
     cd ..
 
     CPPFLAGS="${CPPFLAGS} -I$PWD/depends/${CARCH}-unknown-linux-gnu/include"
@@ -52,22 +42,19 @@
     LDFLAGS="${LDFLAGS} -L${PWD}/depends/${CARCH}-unknown-linux-gnu/lib -L${PWD}/depends/x86_64-unknown-linux-gnu/lib64"
 
     ./autogen.sh
-    ./configure --prefix=/usr
+    depends_prefix="${PWD}/depends/x86_64-unknown-linux-gnu" ./configure --prefix=/usr
     make
 }
 
 check() {
-    cd ${pkgname}-${pkgver}
+    cd ${pkgname}
 
-    # ./qa/zcash/full-test-suite.sh
-
-    # Run the RPC tests
     # ./zcutil/fetch-params.sh
-    # ./qa/pull-tester/rpc-tests.sh
+    # ./qa/zcash/full_test_suite.py
 }
 
 package() {
-    cd ${pkgname}-${pkgver}
+    cd ${pkgname}
 
     make DESTDIR="${pkgdir}" install
 

Modified: boost-no-mt-suffix.patch
===================================================================
--- boost-no-mt-suffix.patch	2017-11-22 14:30:03 UTC (rev 268034)
+++ boost-no-mt-suffix.patch	2017-11-22 14:32:00 UTC (rev 268035)
@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -778,7 +778,7 @@
-   RUST_LIBS="-lrustzcash"
+@@ -770,7 +770,7 @@
+   LIBSNARK_DEPINST="$prefix"
  fi
  
--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"
+-LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp $RUST_LIBS"
++LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium -fopenmp $RUST_LIBS"
  
  CXXFLAGS_TEMP="$CXXFLAGS"
  LIBS_TEMP="$LIBS"