[arch-commits] Commit in zcash/repos/community-x86_64 (8 files)
Nicola Squartini
tensor5 at archlinux.org
Mon Apr 27 06:02:31 UTC 2020
Date: Monday, April 27, 2020 @ 06:02:30
Author: tensor5
Revision: 621789
archrelease: copy trunk to community-x86_64
Added:
zcash/repos/community-x86_64/PKGBUILD
(from rev 621788, zcash/trunk/PKGBUILD)
zcash/repos/community-x86_64/use-system-qpid-proton.patch
(from rev 621788, zcash/trunk/use-system-qpid-proton.patch)
zcash/repos/community-x86_64/use-system-rust.patch
(from rev 621788, zcash/trunk/use-system-rust.patch)
zcash/repos/community-x86_64/zcashd.service
(from rev 621788, zcash/trunk/zcashd.service)
Deleted:
zcash/repos/community-x86_64/PKGBUILD
zcash/repos/community-x86_64/use-system-qpid-proton.patch
zcash/repos/community-x86_64/use-system-rust.patch
zcash/repos/community-x86_64/zcashd.service
------------------------------+
PKGBUILD | 216 +++++++++++++----------------------------
use-system-qpid-proton.patch | 52 ++++-----
use-system-rust.patch | 36 ++----
zcashd.service | 18 +--
4 files changed, 122 insertions(+), 200 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-27 06:01:49 UTC (rev 621788)
+++ PKGBUILD 2020-04-27 06:02:30 UTC (rev 621789)
@@ -1,143 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=zcash
-pkgver=2.1.1_1
-_commit=5cb77119e4327a652908e4fede9b3816d37487f3
-pkgrel=1
-pkgdesc='Permissionless financial system employing zero-knowledge security'
-arch=('x86_64')
-url='https://z.cash/'
-license=('MIT')
-depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq')
-makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget')
-checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton')
-source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"
- 'use-system-qpid-proton.patch'
- 'use-system-rust.patch'
- 'zcashd.service')
-sha512sums=('SKIP'
- '2d877820a16c4cd89f5506e59575e23088df418f8cb8a0cf78d28365704b1ada5154bb13ab645a00cfda1329c25b4dcc8e3c0851302e788087c932adf98a9090'
- 'e905707b3fbbce732c77ff0c831b33a4778d62f4c0404f93c587d20a9c893b141c2acbde80a10ced98631668d62c9689b8faef3163aeb178b20391e06833a360'
- '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
-
-prepare() {
- cd ${pkgname}
-
- # Set gitattributes on src/clientversion.cpp
- git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
-
- patch -Np1 -i ../use-system-qpid-proton.patch
- patch -Np1 -i ../use-system-rust.patch
-}
-
-build() {
- cd ${pkgname}
-
- cd depends
- rust_crates=(
- crate_aes
- crate_aesni
- crate_aes_soft
- crate_arrayref
- crate_arrayvec
- crate_autocfg
- crate_bech32
- crate_bit_vec
- crate_blake2b_simd
- crate_blake2s_simd
- crate_block_buffer
- crate_block_cipher_trait
- crate_block_padding
- crate_byte_tools
- crate_byteorder
- crate_c2_chacha
- crate_cfg_if
- crate_constant_time_eq
- crate_crossbeam_channel
- crate_crossbeam_deque
- crate_crossbeam_epoch
- crate_crossbeam_queue
- crate_crossbeam_utils
- crate_crossbeam
- crate_crypto_api_chachapoly
- crate_crypto_api
- crate_digest
- crate_directories
- crate_fake_simd
- crate_fpe
- crate_futures_cpupool
- crate_futures
- crate_generic_array
- crate_getrandom
- crate_hex
- crate_lazy_static
- crate_libc
- crate_log
- crate_memoffset
- crate_nodrop
- crate_num_bigint
- crate_num_cpus
- crate_num_integer
- crate_num_traits
- crate_opaque_debug
- crate_ppv_lite86
- crate_proc_macro2
- crate_quote
- crate_rand_chacha
- crate_rand_core
- crate_rand_hc
- crate_rand_os
- crate_rand_xorshift
- crate_rand
- crate_rustc_version
- crate_scopeguard
- crate_semver_parser
- crate_semver
- crate_sha2
- crate_syn
- crate_typenum
- crate_unicode_xid
- crate_wasi
- crate_winapi_i686_pc_windows_gnu
- crate_winapi
- crate_winapi_x86_64_pc_windows_gnu
- )
- make install \
- native_packages='' \
- packages="bdb ${rust_crates[*]} librustzcash"
- cd ..
-
- BUILD="$(./depends/config.guess)"
- CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include"
- LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib"
-
- ./autogen.sh
- depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${pkgname}
-
- # Tests require python2
- mkdir "${srcdir}/python"
- ln -s /usr/bin/python2 "${srcdir}/python/python"
- export PATH="${srcdir}/python:${PATH}"
-
- ./zcutil/fetch-params.sh --testnet
- # ./qa/zcash/full_test_suite.py
-}
-
-package() {
- cd ${pkgname}
-
- make DESTDIR="${pkgdir}" install
-
- for ext in '-cli' '-tx' 'd'; do
- install -Dm644 contrib/zcash${ext}.bash-completion \
- "${pkgdir}"/usr/share/bash-completion/completions/zcash${ext}
- done
-
- install -Dm644 -t "${pkgdir}"/usr/lib/systemd/user ../zcashd.service
- install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
-}
Copied: zcash/repos/community-x86_64/PKGBUILD (from rev 621788, zcash/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-27 06:02:30 UTC (rev 621789)
@@ -0,0 +1,73 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=zcash
+pkgver=2.1.2
+_commit=ff1e8ebe2fe86394739e3190a06e5ea7fd85ace0
+pkgrel=1
+pkgdesc='Permissionless financial system employing zero-knowledge security'
+arch=('x86_64')
+url='https://z.cash/'
+license=('MIT')
+depends=('boost-libs' 'libevent' 'qpid-proton' '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}"
+ 'use-system-qpid-proton.patch'
+ 'use-system-rust.patch'
+ 'zcashd.service')
+sha512sums=('SKIP'
+ '0d9c089e1b9eddc127936dbc12984804f3ad65c35845a336368cc9fce22ae784fb486a9a74b5cf34f42739779b42c18084f0558c9c1c74f18c6d8999596c7af6'
+ '1267fc174df81a80a1b0f2e1a6bbaaa6fa95402c83bc6a8678b582ed6c7f7a02eeed0f61c9600496aa782f9fb9fec6dc9ac419d366d059306a5c4f97a5a166f0'
+ '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
+
+prepare() {
+ cd ${pkgname}
+
+ # Set gitattributes on src/clientversion.cpp
+ git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
+
+ patch -Np1 -i ../use-system-qpid-proton.patch
+ patch -Np1 -i ../use-system-rust.patch
+}
+
+build() {
+ cd ${pkgname}
+
+ cd depends
+ make install \
+ native_packages='' \
+ packages="bdb utfcpp"
+ cd ..
+
+ BUILD="$(./depends/config.guess)"
+ CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include"
+ LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib"
+
+ ./autogen.sh
+ depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr \
+ --enable-online-rust \
+ --enable-proton
+ make RUST_TARGET="${BUILD}"
+}
+
+check() {
+ cd ${pkgname}
+
+ ./zcutil/fetch-params.sh --testnet
+ export RUST_TARGET="$(./depends/config.guess)"
+ ./qa/zcash/full_test_suite.py || true
+}
+
+package() {
+ cd ${pkgname}
+
+ make DESTDIR="${pkgdir}" RUST_TARGET="$(./depends/config.guess)" install
+
+ for ext in '-cli' '-tx' 'd'; do
+ install -Dm644 contrib/zcash${ext}.bash-completion \
+ "${pkgdir}"/usr/share/bash-completion/completions/zcash${ext}
+ done
+
+ install -Dm644 -t "${pkgdir}"/usr/lib/systemd/user ../zcashd.service
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+}
Deleted: use-system-qpid-proton.patch
===================================================================
--- use-system-qpid-proton.patch 2020-04-27 06:01:49 UTC (rev 621788)
+++ use-system-qpid-proton.patch 2020-04-27 06:02:30 UTC (rev 621789)
@@ -1,26 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -598,17 +598,13 @@
- [],
- [AC_MSG_WARN([Proton headers not found, disabling Proton support])
- use_proton=no])
-- AC_CHECK_LIB([qpid-proton-cpp-static], [main],
-- [PROTON_LIBS="-lqpid-proton-cpp-static"],
-- [AC_MSG_WARN([Proton qpid-proton-cpp-static library not found, disabling Proton support])
-+ AC_CHECK_LIB([qpid-proton-cpp], [main],
-+ [PROTON_LIBS="-lqpid-proton-cpp"],
-+ [AC_MSG_WARN([Proton qpid-proton-cpp library not found, disabling Proton support])
- use_proton=no])
-- AC_CHECK_LIB([qpid-proton-core-static], [main],
-- [PROTON_LIBS+=" -lqpid-proton-core-static"],
-- [AC_MSG_WARN([Proton qpid-proton-core-static library not found, disabling Proton support])
-- use_proton=no])
-- AC_CHECK_LIB([qpid-proton-static], [main],
-- [PROTON_LIBS+=" -lqpid-proton-static"],
-- [AC_MSG_WARN([Proton qpid-proton-static library not found, disabling Proton support])
-+ AC_CHECK_LIB([qpid-proton-core], [main],
-+ [PROTON_LIBS+=" -lqpid-proton-core"],
-+ [AC_MSG_WARN([Proton qpid-proton-core library not found, disabling Proton support])
- use_proton=no])
- fi
- if test x$use_proton = xyes; then
Copied: zcash/repos/community-x86_64/use-system-qpid-proton.patch (from rev 621788, zcash/trunk/use-system-qpid-proton.patch)
===================================================================
--- use-system-qpid-proton.patch (rev 0)
+++ use-system-qpid-proton.patch 2020-04-27 06:02:30 UTC (rev 621789)
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -672,17 +672,13 @@
+ [],
+ [AC_MSG_WARN([Proton headers not found, disabling Proton support])
+ use_proton=no])
+- AC_CHECK_LIB([qpid-proton-cpp-static], [main],
+- [PROTON_LIBS="-lqpid-proton-cpp-static"],
+- [AC_MSG_WARN([Proton qpid-proton-cpp-static library not found, disabling Proton support])
++ AC_CHECK_LIB([qpid-proton-cpp], [main],
++ [PROTON_LIBS="-lqpid-proton-cpp"],
++ [AC_MSG_WARN([Proton qpid-proton-cpp library not found, disabling Proton support])
+ use_proton=no])
+- AC_CHECK_LIB([qpid-proton-core-static], [main],
+- [PROTON_LIBS+=" -lqpid-proton-core-static"],
+- [AC_MSG_WARN([Proton qpid-proton-core-static library not found, disabling Proton support])
+- use_proton=no])
+- AC_CHECK_LIB([qpid-proton-static], [main],
+- [PROTON_LIBS+=" -lqpid-proton-static"],
+- [AC_MSG_WARN([Proton qpid-proton-static library not found, disabling Proton support])
++ AC_CHECK_LIB([qpid-proton-core], [main],
++ [PROTON_LIBS+=" -lqpid-proton-core"],
++ [AC_MSG_WARN([Proton qpid-proton-core library not found, disabling Proton support])
+ use_proton=no])
+ fi
+ if test x$use_proton = xyes; then
Deleted: use-system-rust.patch
===================================================================
--- use-system-rust.patch 2020-04-27 06:01:49 UTC (rev 621788)
+++ use-system-rust.patch 2020-04-27 06:02:30 UTC (rev 621789)
@@ -1,22 +0,0 @@
---- a/depends/packages/librustzcash.mk
-+++ b/depends/packages/librustzcash.mk
-@@ -5,9 +5,8 @@
- $(package)_download_file=$($(package)_git_commit).tar.gz
- $(package)_sha256_hash=dfb80e9a57d944a91092094a423a8a6631e38b602b337aad5f98dc21002ca6dc
- $(package)_git_commit=a57dc7f47807ea50cb0a5deec9b84b3e7da11bc0
--$(package)_dependencies=rust
- ifeq ($(LIBRUSTZCASH_OVERRIDE),)
--$(package)_dependencies+=$(rust_crates)
-+$(package)_dependencies=$(rust_crates)
- $(package)_patches=cargo.config remove-dev-dependencies.diff
- endif
-
-@@ -60,7 +59,7 @@
- endef
-
- define $(package)_build_cmds
-- $(host_prefix)/native/bin/cargo build --package librustzcash $($(package)_build_opts)
-+ cargo build --package librustzcash $($(package)_build_opts)
- endef
-
- define $(package)_stage_cmds
Copied: zcash/repos/community-x86_64/use-system-rust.patch (from rev 621788, zcash/trunk/use-system-rust.patch)
===================================================================
--- use-system-rust.patch (rev 0)
+++ use-system-rust.patch 2020-04-27 06:02:30 UTC (rev 621789)
@@ -0,0 +1,14 @@
+--- a/qa/zcash/full_test_suite.py
++++ b/qa/zcash/full_test_suite.py
+@@ -133,9 +133,9 @@
+
+ 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'),
Deleted: zcashd.service
===================================================================
--- zcashd.service 2020-04-27 06:01:49 UTC (rev 621788)
+++ zcashd.service 2020-04-27 06:02:30 UTC (rev 621789)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Zcash daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/zcashd
-
-[Install]
-WantedBy=default.target
Copied: zcash/repos/community-x86_64/zcashd.service (from rev 621788, zcash/trunk/zcashd.service)
===================================================================
--- zcashd.service (rev 0)
+++ zcashd.service 2020-04-27 06:02:30 UTC (rev 621789)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Zcash daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/zcashd
+
+[Install]
+WantedBy=default.target
More information about the arch-commits
mailing list