depends: Add cxxbridge command to dependencies
This commit is contained in:
parent
b31b1211cd
commit
ee23587268
|
@ -58,7 +58,8 @@ ed25519-zebra = "3"
|
|||
zeroize = "1.4.2"
|
||||
|
||||
# Rust/C++ interop
|
||||
cxx = { version = "1.0", features = ["c++17"] }
|
||||
# The version needs to match depends/packages/native_cxxbridge.mk
|
||||
cxx = { version = "=1.0.68", features = ["c++17"] }
|
||||
|
||||
# Rust threading
|
||||
rayon = "1.5"
|
||||
|
|
|
@ -101,6 +101,7 @@ ZC_REQUIRE_TOOL(STRIP, strip)
|
|||
ZC_REQUIRE_PROG([GIT], [git])
|
||||
ZC_REQUIRE_PROG(RUSTC, rustc)
|
||||
ZC_REQUIRE_PROG(CARGO, cargo)
|
||||
ZC_REQUIRE_PROG(CXXBRIDGE, cxxbridge)
|
||||
dnl This one is still optional and checked by complicated logic below:
|
||||
AC_PATH_PROG(CCACHE,ccache)
|
||||
dnl This one is not currently used anywhere, thus not required:
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
package=native_cxxbridge
|
||||
# The version needs to match cxx in Cargo.toml
|
||||
$(package)_version=1.0.68
|
||||
$(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags
|
||||
$(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz
|
||||
$(package)_download_file=$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=6fed9ef1c64a37c343727368b38c27fa4e15b27ca9924c6672a6a5496080c832
|
||||
$(package)_build_subdir=gen/cmd
|
||||
$(package)_dependencies=native_rust
|
||||
|
||||
define $(package)_build_cmds
|
||||
cargo build --release --package=cxxbridge-cmd --bin=cxxbridge
|
||||
endef
|
||||
|
||||
define $(package)_stage_cmds
|
||||
cargo install --offline --path=. --bin=cxxbridge --root=$($(package)_staging_prefix_dir)
|
||||
endef
|
|
@ -1,6 +1,6 @@
|
|||
zcash_packages := libsodium utfcpp
|
||||
packages := boost libevent zeromq $(zcash_packages) googletest
|
||||
native_packages := native_clang native_ccache native_rust
|
||||
native_packages := native_clang native_ccache native_rust native_cxxbridge
|
||||
|
||||
ifneq (,$(wildcard /etc/arch-release))
|
||||
native_packages += native_libtinfo
|
||||
|
|
Loading…
Reference in New Issue