Date: Sunday, November 22, 2020 @ 12:00:28 Author: tensor5 Revision: 758916
upgpkg: zcash 4.1.1-1 Modified: zcash/trunk/PKGBUILD zcash/trunk/use-system-rust.patch -----------------------+ PKGBUILD | 49 ++++++++++++++++++++++++++++-------------------- use-system-rust.patch | 22 ++++++++++----------- 2 files changed, 40 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-22 12:00:27 UTC (rev 758915) +++ PKGBUILD 2020-11-22 12:00:28 UTC (rev 758916) @@ -1,22 +1,26 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=zcash -pkgver=4.0.0 -_commit=5e7e9687fc87a2426bafef2837174eac52978b4c -pkgrel=2 +pkgver=4.1.1 +_commit=6d856869e9c4cb9e6f3332db6fb04b956bb9fd3d +_db_version=6.2.23 +_db_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7 +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' 'utf8cpp' 'zeromq') makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget') checkdepends=('python-pyblake2' 'python-pyzmq' 'python-requests' 'python-simplejson') source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"; + "https://download.oracle.com/berkeley-db/db-${_db_version}.tar.gz"; 'use-system-rust.patch' 'zcashd.service') -sha512sums=('SKIP' - '1267fc174df81a80a1b0f2e1a6bbaaa6fa95402c83bc6a8678b582ed6c7f7a02eeed0f61c9600496aa782f9fb9fec6dc9ac419d366d059306a5c4f97a5a166f0' - '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') +sha256sums=('SKIP' + "${_db_sha256_hash}" + '119e787cb22f2941ead286d2621fae7d6c4de6216e24615eb3c0f875e7a2547f' + '7b0919ac447824199aff8c17b5a5799b46414818c6aed314506c5295d0ce9ccd') prepare() { cd ${pkgname} @@ -28,22 +32,27 @@ } build() { - cd ${pkgname} + cd "db-${_db_version}/build_unix" - cd depends - make install \ - native_packages='' \ - packages="bdb utfcpp" - cd .. + ../dist/configure \ + --prefix=/ \ + --disable-shared \ + --enable-cxx \ + --disable-replication \ + --enable-option-checking \ + --with-pic + make libdb_cxx-6.2.a libdb-6.2.a + make DESTDIR="${srcdir}/db-root" install - BUILD="$(./depends/config.guess)" - CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include" - LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib" + cd "${srcdir}/${pkgname}" + CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp" + LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib" + ./autogen.sh - depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --enable-online-rust - make RUST_TARGET="${BUILD}" + make RUST_TARGET=x86_64-unknown-linux-gnu } check() { @@ -50,7 +59,7 @@ cd ${pkgname} ./zcutil/fetch-params.sh --testnet - export RUST_TARGET="$(./depends/config.guess)" + export RUST_TARGET=x86_64-unknown-linux-gnu ./qa/zcash/full_test_suite.py || true } @@ -57,7 +66,7 @@ package() { cd ${pkgname} - make DESTDIR="${pkgdir}" RUST_TARGET="$(./depends/config.guess)" install + make DESTDIR="${pkgdir}" RUST_TARGET=x86_64-unknown-linux-gnu install for ext in '-cli' '-tx' 'd'; do install -Dm644 contrib/zcash${ext}.bash-completion \ Modified: use-system-rust.patch =================================================================== --- use-system-rust.patch 2020-11-22 12:00:27 UTC (rev 758915) +++ use-system-rust.patch 2020-11-22 12:00:28 UTC (rev 758916) @@ -1,14 +1,14 @@ --- a/qa/zcash/full_test_suite.py +++ b/qa/zcash/full_test_suite.py -@@ -133,9 +133,9 @@ +@@ -149,9 +149,9 @@ + return False - if os.path.isdir(depends_dir): - rust_env = os.environ.copy() -- rust_env['RUSTC'] = os.path.join(depends_dir, 'native', 'bin', 'rustc') -+ rust_env['RUSTC'] = 'rustc' - return subprocess.call([ -- os.path.join(depends_dir, 'native', 'bin', 'cargo'), -+ 'cargo', - 'test', - '--manifest-path', - os.path.join(REPOROOT, 'Cargo.toml'), + rust_env = os.environ.copy() +- rust_env['RUSTC'] = os.path.join(arch_dir, 'native', 'bin', 'rustc') ++ rust_env['RUSTC'] = 'rustc' + return subprocess.call([ +- os.path.join(arch_dir, 'native', 'bin', 'cargo'), ++ 'cargo', + 'test', + '--manifest-path', + os.path.join(REPOROOT, 'Cargo.toml'),
