From fc7acb3b271f6cc1b7353230a559eec5d4047680 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Tue, 9 Mar 2021 17:20:41 -0800 Subject: [PATCH 1/3] [Depends] Switch to `cargo vendor` for Rust dependencies --- depends/Makefile | 36 +++++++-- depends/README.md | 2 - depends/funcs.mk | 17 +---- depends/packages/crate_aes.mk | 15 ---- depends/packages/crate_aes_soft.mk | 15 ---- depends/packages/crate_aesni.mk | 15 ---- depends/packages/crate_arrayref.mk | 15 ---- depends/packages/crate_arrayvec.mk | 15 ---- depends/packages/crate_autocfg.mk | 15 ---- depends/packages/crate_bellman.mk | 15 ---- depends/packages/crate_bit_vec.mk | 15 ---- depends/packages/crate_blake2b_simd.mk | 15 ---- depends/packages/crate_blake2s_simd.mk | 15 ---- depends/packages/crate_block_buffer.mk | 15 ---- depends/packages/crate_block_cipher_trait.mk | 15 ---- depends/packages/crate_block_padding.mk | 15 ---- depends/packages/crate_byte_tools.mk | 15 ---- depends/packages/crate_byteorder.mk | 15 ---- depends/packages/crate_c2_chacha.mk | 15 ---- depends/packages/crate_cfg_if.mk | 15 ---- depends/packages/crate_constant_time_eq.mk | 15 ---- depends/packages/crate_crossbeam.mk | 15 ---- depends/packages/crate_crossbeam_channel.mk | 15 ---- depends/packages/crate_crossbeam_deque.mk | 15 ---- depends/packages/crate_crossbeam_epoch.mk | 15 ---- depends/packages/crate_crossbeam_queue.mk | 15 ---- depends/packages/crate_crossbeam_utils.mk | 15 ---- depends/packages/crate_crypto_api.mk | 15 ---- .../packages/crate_crypto_api_chachapoly.mk | 15 ---- depends/packages/crate_digest.mk | 15 ---- depends/packages/crate_directories.mk | 15 ---- depends/packages/crate_fake_simd.mk | 15 ---- depends/packages/crate_ff.mk | 15 ---- depends/packages/crate_ff_derive.mk | 15 ---- depends/packages/crate_fpe.mk | 15 ---- depends/packages/crate_futures.mk | 15 ---- depends/packages/crate_futures_cpupool.mk | 15 ---- depends/packages/crate_generic_array.mk | 15 ---- depends/packages/crate_getrandom.mk | 15 ---- depends/packages/crate_group.mk | 15 ---- depends/packages/crate_hex.mk | 15 ---- depends/packages/crate_lazy_static.mk | 15 ---- depends/packages/crate_libc.mk | 15 ---- depends/packages/crate_log.mk | 15 ---- depends/packages/crate_memoffset.mk | 15 ---- depends/packages/crate_nodrop.mk | 15 ---- depends/packages/crate_num_bigint.mk | 15 ---- depends/packages/crate_num_cpus.mk | 15 ---- depends/packages/crate_num_integer.mk | 15 ---- depends/packages/crate_num_traits.mk | 15 ---- depends/packages/crate_opaque_debug.mk | 15 ---- depends/packages/crate_pairing.mk | 15 ---- depends/packages/crate_ppv_lite86.mk | 15 ---- depends/packages/crate_proc_macro2.mk | 15 ---- depends/packages/crate_quote.mk | 15 ---- depends/packages/crate_rand.mk | 15 ---- depends/packages/crate_rand_chacha.mk | 15 ---- depends/packages/crate_rand_core.mk | 15 ---- depends/packages/crate_rand_hc.mk | 15 ---- depends/packages/crate_rand_xorshift.mk | 15 ---- depends/packages/crate_rustc_version.mk | 15 ---- depends/packages/crate_scopeguard.mk | 15 ---- depends/packages/crate_semver.mk | 15 ---- depends/packages/crate_semver_parser.mk | 15 ---- depends/packages/crate_sha2.mk | 15 ---- depends/packages/crate_syn.mk | 15 ---- depends/packages/crate_typenum.mk | 15 ---- depends/packages/crate_unicode_xid.mk | 15 ---- depends/packages/crate_wasi.mk | 15 ---- depends/packages/crate_winapi.mk | 15 ---- .../crate_winapi_i686_pc_windows_gnu.mk | 15 ---- .../crate_winapi_x86_64_pc_windows_gnu.mk | 15 ---- depends/packages/crate_zcash_primitives.mk | 15 ---- depends/packages/crate_zcash_proofs.mk | 15 ---- depends/packages/{rust.mk => native_rust.mk} | 8 +- depends/packages/packages.mk | 75 +------------------ rust-toolchain | 2 +- 77 files changed, 36 insertions(+), 1169 deletions(-) delete mode 100644 depends/packages/crate_aes.mk delete mode 100644 depends/packages/crate_aes_soft.mk delete mode 100644 depends/packages/crate_aesni.mk delete mode 100644 depends/packages/crate_arrayref.mk delete mode 100644 depends/packages/crate_arrayvec.mk delete mode 100644 depends/packages/crate_autocfg.mk delete mode 100644 depends/packages/crate_bellman.mk delete mode 100644 depends/packages/crate_bit_vec.mk delete mode 100644 depends/packages/crate_blake2b_simd.mk delete mode 100644 depends/packages/crate_blake2s_simd.mk delete mode 100644 depends/packages/crate_block_buffer.mk delete mode 100644 depends/packages/crate_block_cipher_trait.mk delete mode 100644 depends/packages/crate_block_padding.mk delete mode 100644 depends/packages/crate_byte_tools.mk delete mode 100644 depends/packages/crate_byteorder.mk delete mode 100644 depends/packages/crate_c2_chacha.mk delete mode 100644 depends/packages/crate_cfg_if.mk delete mode 100644 depends/packages/crate_constant_time_eq.mk delete mode 100644 depends/packages/crate_crossbeam.mk delete mode 100644 depends/packages/crate_crossbeam_channel.mk delete mode 100644 depends/packages/crate_crossbeam_deque.mk delete mode 100644 depends/packages/crate_crossbeam_epoch.mk delete mode 100644 depends/packages/crate_crossbeam_queue.mk delete mode 100644 depends/packages/crate_crossbeam_utils.mk delete mode 100644 depends/packages/crate_crypto_api.mk delete mode 100644 depends/packages/crate_crypto_api_chachapoly.mk delete mode 100644 depends/packages/crate_digest.mk delete mode 100644 depends/packages/crate_directories.mk delete mode 100644 depends/packages/crate_fake_simd.mk delete mode 100644 depends/packages/crate_ff.mk delete mode 100644 depends/packages/crate_ff_derive.mk delete mode 100644 depends/packages/crate_fpe.mk delete mode 100644 depends/packages/crate_futures.mk delete mode 100644 depends/packages/crate_futures_cpupool.mk delete mode 100644 depends/packages/crate_generic_array.mk delete mode 100644 depends/packages/crate_getrandom.mk delete mode 100644 depends/packages/crate_group.mk delete mode 100644 depends/packages/crate_hex.mk delete mode 100644 depends/packages/crate_lazy_static.mk delete mode 100644 depends/packages/crate_libc.mk delete mode 100644 depends/packages/crate_log.mk delete mode 100644 depends/packages/crate_memoffset.mk delete mode 100644 depends/packages/crate_nodrop.mk delete mode 100644 depends/packages/crate_num_bigint.mk delete mode 100644 depends/packages/crate_num_cpus.mk delete mode 100644 depends/packages/crate_num_integer.mk delete mode 100644 depends/packages/crate_num_traits.mk delete mode 100644 depends/packages/crate_opaque_debug.mk delete mode 100644 depends/packages/crate_pairing.mk delete mode 100644 depends/packages/crate_ppv_lite86.mk delete mode 100644 depends/packages/crate_proc_macro2.mk delete mode 100644 depends/packages/crate_quote.mk delete mode 100644 depends/packages/crate_rand.mk delete mode 100644 depends/packages/crate_rand_chacha.mk delete mode 100644 depends/packages/crate_rand_core.mk delete mode 100644 depends/packages/crate_rand_hc.mk delete mode 100644 depends/packages/crate_rand_xorshift.mk delete mode 100644 depends/packages/crate_rustc_version.mk delete mode 100644 depends/packages/crate_scopeguard.mk delete mode 100644 depends/packages/crate_semver.mk delete mode 100644 depends/packages/crate_semver_parser.mk delete mode 100644 depends/packages/crate_sha2.mk delete mode 100644 depends/packages/crate_syn.mk delete mode 100644 depends/packages/crate_typenum.mk delete mode 100644 depends/packages/crate_unicode_xid.mk delete mode 100644 depends/packages/crate_wasi.mk delete mode 100644 depends/packages/crate_winapi.mk delete mode 100644 depends/packages/crate_winapi_i686_pc_windows_gnu.mk delete mode 100644 depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk delete mode 100644 depends/packages/crate_zcash_primitives.mk delete mode 100644 depends/packages/crate_zcash_proofs.mk rename depends/packages/{rust.mk => native_rust.mk} (96%) diff --git a/depends/Makefile b/depends/Makefile index 5a39ec94ae31..c07adde54743 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -48,10 +48,10 @@ HASH_LENGTH:=11 DOWNLOAD_CONNECT_TIMEOUT:=30 DOWNLOAD_RETRIES:=3 CRATE_REGISTRY:=vendored-sources +CRATE_ARCHIVE = $(SOURCES_PATH)/vendored-crates.tar.gz HOST_ID_SALT ?= salt BUILD_ID_SALT ?= salt -LIBRUSTZCASH_OVERRIDE ?= host:=$(BUILD) ifneq ($(HOST),) @@ -135,7 +135,7 @@ natpmp_packages_$(NO_NATPMP) = $(natpmp_packages) zmq_packages_$(NO_ZMQ) = $(zmq_packages) -packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(rust_packages) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) +packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) ifneq ($(qt_packages_),) @@ -169,6 +169,12 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages) $(AT)echo copying packages: $^ $(AT)echo to: $(@D) $(AT)cd $(@D); $(foreach package,$^, tar xf $($(package)_cached); ) + $(AT)if test -f "$(CRATE_ARCHIVE)"; \ + then echo Extracting pre-vendored crates from $(CRATE_ARCHIVE)...; \ + tar xf $(CRATE_ARCHIVE) -C $(@D); \ + else echo Vendoring crates...; \ + $(@D)/native/bin/cargo vendor --locked --manifest-path $(BASEDIR)/../Cargo.toml $(@D)/$(CRATE_REGISTRY); \ + fi $(AT)touch $@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id) @@ -186,7 +192,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \ -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \ -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \ - -e 's|@rust_target@|$(call rust_target,rust,$(canonical_host),$(host_os))|' \ + -e 's|@rust_target@|$(call rust_target,native_rust,$(canonical_host),$(host_os))|' \ -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \ -e 's|@no_qt@|$(NO_QT)|' \ -e 's|@no_zmq@|$(NO_ZMQ)|' \ @@ -213,9 +219,13 @@ define check_or_remove_sources endef check-packages: - @$(foreach package,$(all_packages),$(call check_or_remove_cached,$(package));) + @$(foreach package,$(packages),$(call check_or_remove_cached,$(package));) + @$(foreach package,$(rust_crates),$(call check_or_remove_cached,$(package));) + @$(foreach package,$(native_packages),$(call check_or_remove_cached,$(package));) check-sources: - @$(foreach package,$(all_packages),$(call check_or_remove_sources,$(package));) + @$(foreach package,$(packages),$(call check_or_remove_sources,$(package));) + @$(foreach package,$(rust_crates),$(call check_or_remove_sources,$(package));) + @$(foreach package,$(native_packages),$(call check_or_remove_sources,$(package));) $(host_prefix)/share/config.site: check-packages @@ -230,6 +240,18 @@ clean: install: check-packages $(host_prefix)/share/config.site +crates_download_dir=$(base_download_dir)/crates +download-crates: native_rust + $(AT)echo Vendoring crates... + $(AT)mkdir -p $(SOURCES_PATH) + $(AT)rm -rf $(crates_download_dir) + $(AT)mkdir -p $(crates_download_dir) + $(AT)tar xf $(native_rust_cached) -C $(crates_download_dir) + $(AT)$(crates_download_dir)/native/bin/cargo vendor --locked --manifest-path $(BASEDIR)/../Cargo.toml $(crates_download_dir)/$(CRATE_REGISTRY) + $(AT)cd $(crates_download_dir); find $(CRATE_REGISTRY) | sort | tar --no-recursion -czf $(CRATE_ARCHIVE) -T - + $(AT)rm -rf $(crates_download_dir) + + download-one: check-sources $(all_sources) download-osx: @@ -238,8 +260,8 @@ download-linux: @$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one download-win: @$(MAKE) -s HOST=x86_64-w64-mingw32 download-one -download: download-osx download-linux download-win +download: download-crates download-osx download-linux download-win $(foreach package,$(all_packages),$(eval $(call ext_add_stages,$(package)))) -.PHONY: install cached clean clean-all download-one download-osx download-linux download-win download check-packages check-sources +.PHONY: install cached clean clean-all download-crates download-one download-osx download-linux download-win download check-packages check-sources diff --git a/depends/README.md b/depends/README.md index d20c61fcd8c9..aad4b9736abc 100644 --- a/depends/README.md +++ b/depends/README.md @@ -95,8 +95,6 @@ build script logic) are searched for among the host system packages using `pkg-config`. It allows building with packages of other (newer) versions
DEBUG
disable some optimizations and enable more runtime checking
-
LIBRUSTZCASH_OVERRIDE
-
Path to a local librustzcash repository
HOST_ID_SALT
Optional salt to use when generating host package ids
BUILD_ID_SALT
diff --git a/depends/funcs.mk b/depends/funcs.mk index 5cb244d054fb..58b65e9693e3 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -34,21 +34,6 @@ define fetch_file $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))) endef -define generate_crate_checksum -$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "\"$($(1)_sha256_hash)\"" -endef - -define generate_unpackaged_crate_checksum -$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "null" -endef - -define vendor_crate_source -mkdir -p $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY) && \ -cp -r $($(1)_extract_dir) $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY)/$($(1)_crate_name) && \ -cd $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY)/$($(1)_crate_versioned_name) && \ -rm -r `basename $($(1)_patch_dir)` .stamp_* .$($(1)_file_name).hash -endef - define int_get_build_recipe_hash $(eval $(1)_all_file_checksums:=$(shell $(build_SHA256SUM) $(meta_depends) packages/$(1).mk $(addprefix $(PATCHES_PATH)/$(1)/,$($(1)_patches)) | cut -d" " -f1)) $(eval $(1)_recipe_hash:=$(shell echo -n "$($(1)_all_file_checksums)" | $(build_SHA256SUM) | cut -d" " -f1)) @@ -65,11 +50,11 @@ final_build_id_long+=$($(package)_build_id_long) #override platform specific files and hashes $(eval $(1)_file_name=$(if $($(1)_exact_file_name),$($(1)_exact_file_name),$(if $($(1)_file_name_$(host_os)),$($(1)_file_name_$(host_os)),$($(1)_file_name)))) $(eval $(1)_sha256_hash=$(if $($(1)_exact_sha256_hash),$($(1)_exact_sha256_hash),$(if $($(1)_sha256_hash_$(host_os)),$($(1)_sha256_hash_$(host_os)),$($(1)_sha256_hash)))) +$(eval $(1)_download_file=$(if $($(1)_exact_download_file),$($(1)_exact_download_file),$(if $($(1)_download_file_$(host_os)),$($(1)_download_file_$(host_os)),$(if $($(1)_download_file),$($(1)_download_file),$($(1)_file_name))))) #compute package-specific paths $(1)_build_subdir?=. -$(1)_download_file?=$($(1)_file_name) $(1)_source_dir:=$(SOURCES_PATH) $(1)_source:=$$($(1)_source_dir)/$($(1)_file_name) $(1)_staging_dir=$(base_staging_dir)/$(host)/$(1)/$($(1)_version)-$($(1)_build_id) diff --git a/depends/packages/crate_aes.mk b/depends/packages/crate_aes.mk deleted file mode 100644 index 0e2a293920d0..000000000000 --- a/depends/packages/crate_aes.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_aes -$(package)_crate_name=aes -$(package)_version=0.3.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_aes_soft.mk b/depends/packages/crate_aes_soft.mk deleted file mode 100644 index 5dcd153ee29c..000000000000 --- a/depends/packages/crate_aes_soft.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_aes_soft -$(package)_crate_name=aes-soft -$(package)_version=0.3.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_aesni.mk b/depends/packages/crate_aesni.mk deleted file mode 100644 index dfd93bce26f7..000000000000 --- a/depends/packages/crate_aesni.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_aesni -$(package)_crate_name=aesni -$(package)_version=0.6.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_arrayref.mk b/depends/packages/crate_arrayref.mk deleted file mode 100644 index 186f5e77bc86..000000000000 --- a/depends/packages/crate_arrayref.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_arrayref -$(package)_crate_name=arrayref -$(package)_version=0.3.5 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_arrayvec.mk b/depends/packages/crate_arrayvec.mk deleted file mode 100644 index faa3b4f558e1..000000000000 --- a/depends/packages/crate_arrayvec.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_arrayvec -$(package)_crate_name=arrayvec -$(package)_version=0.4.11 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_autocfg.mk b/depends/packages/crate_autocfg.mk deleted file mode 100644 index 1b36846ed7da..000000000000 --- a/depends/packages/crate_autocfg.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_autocfg -$(package)_crate_name=autocfg -$(package)_version=0.1.6 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_bellman.mk b/depends/packages/crate_bellman.mk deleted file mode 100644 index 279ea677fb58..000000000000 --- a/depends/packages/crate_bellman.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_bellman -$(package)_crate_name=bellman -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=8a8b3143b11715f8105882a1df9b3d36386aa8e3a6cfd573a2974c9ea9a22fea -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_bit_vec.mk b/depends/packages/crate_bit_vec.mk deleted file mode 100644 index 40575088efaf..000000000000 --- a/depends/packages/crate_bit_vec.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_bit_vec -$(package)_crate_name=bit-vec -$(package)_version=0.4.4 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_blake2b_simd.mk b/depends/packages/crate_blake2b_simd.mk deleted file mode 100644 index c9e3ce0c89ce..000000000000 --- a/depends/packages/crate_blake2b_simd.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_blake2b_simd -$(package)_crate_name=blake2b_simd -$(package)_version=0.5.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_blake2s_simd.mk b/depends/packages/crate_blake2s_simd.mk deleted file mode 100644 index bea01c9b165b..000000000000 --- a/depends/packages/crate_blake2s_simd.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_blake2s_simd -$(package)_crate_name=blake2s_simd -$(package)_version=0.5.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=979da0ce13c897d6be19e005ea77ac12b0fea0157aeeee7feb8c49f91386f0ea -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_block_buffer.mk b/depends/packages/crate_block_buffer.mk deleted file mode 100644 index 26d0b5e48984..000000000000 --- a/depends/packages/crate_block_buffer.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_block_buffer -$(package)_crate_name=block-buffer -$(package)_version=0.7.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_block_cipher_trait.mk b/depends/packages/crate_block_cipher_trait.mk deleted file mode 100644 index 553bd52a9448..000000000000 --- a/depends/packages/crate_block_cipher_trait.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_block_cipher_trait -$(package)_crate_name=block-cipher-trait -$(package)_version=0.6.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_block_padding.mk b/depends/packages/crate_block_padding.mk deleted file mode 100644 index 310a14cf603a..000000000000 --- a/depends/packages/crate_block_padding.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_block_padding -$(package)_crate_name=block-padding -$(package)_version=0.1.4 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_byte_tools.mk b/depends/packages/crate_byte_tools.mk deleted file mode 100644 index a5dff7279716..000000000000 --- a/depends/packages/crate_byte_tools.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_byte_tools -$(package)_crate_name=byte-tools -$(package)_version=0.3.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_byteorder.mk b/depends/packages/crate_byteorder.mk deleted file mode 100644 index cd991687d037..000000000000 --- a/depends/packages/crate_byteorder.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_byteorder -$(package)_crate_name=byteorder -$(package)_version=1.3.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_c2_chacha.mk b/depends/packages/crate_c2_chacha.mk deleted file mode 100644 index fe29c2101bc2..000000000000 --- a/depends/packages/crate_c2_chacha.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_c2_chacha -$(package)_crate_name=c2-chacha -$(package)_version=0.2.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_cfg_if.mk b/depends/packages/crate_cfg_if.mk deleted file mode 100644 index af67660f98eb..000000000000 --- a/depends/packages/crate_cfg_if.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_cfg_if -$(package)_crate_name=cfg-if -$(package)_version=0.1.9 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_constant_time_eq.mk b/depends/packages/crate_constant_time_eq.mk deleted file mode 100644 index 2ed63123833a..000000000000 --- a/depends/packages/crate_constant_time_eq.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_constant_time_eq -$(package)_crate_name=constant_time_eq -$(package)_version=0.1.4 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam.mk b/depends/packages/crate_crossbeam.mk deleted file mode 100644 index 144f35007bb8..000000000000 --- a/depends/packages/crate_crossbeam.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam -$(package)_crate_name=crossbeam -$(package)_version=0.7.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam_channel.mk b/depends/packages/crate_crossbeam_channel.mk deleted file mode 100644 index 618268f4178d..000000000000 --- a/depends/packages/crate_crossbeam_channel.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam_channel -$(package)_crate_name=crossbeam-channel -$(package)_version=0.3.9 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam_deque.mk b/depends/packages/crate_crossbeam_deque.mk deleted file mode 100644 index 881a2c75b034..000000000000 --- a/depends/packages/crate_crossbeam_deque.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam_deque -$(package)_crate_name=crossbeam-deque -$(package)_version=0.7.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam_epoch.mk b/depends/packages/crate_crossbeam_epoch.mk deleted file mode 100644 index b68701642b66..000000000000 --- a/depends/packages/crate_crossbeam_epoch.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam_epoch -$(package)_crate_name=crossbeam-epoch -$(package)_version=0.7.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam_queue.mk b/depends/packages/crate_crossbeam_queue.mk deleted file mode 100644 index 70616caf5168..000000000000 --- a/depends/packages/crate_crossbeam_queue.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam_queue -$(package)_crate_name=crossbeam-queue -$(package)_version=0.1.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crossbeam_utils.mk b/depends/packages/crate_crossbeam_utils.mk deleted file mode 100644 index eabfa26c45d4..000000000000 --- a/depends/packages/crate_crossbeam_utils.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crossbeam_utils -$(package)_crate_name=crossbeam-utils -$(package)_version=0.6.6 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crypto_api.mk b/depends/packages/crate_crypto_api.mk deleted file mode 100644 index e65f6a659be2..000000000000 --- a/depends/packages/crate_crypto_api.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crypto_api -$(package)_crate_name=crypto_api -$(package)_version=0.2.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=2f855e87e75a4799e18b8529178adcde6fd4f97c1449ff4821e747ff728bb102 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_crypto_api_chachapoly.mk b/depends/packages/crate_crypto_api_chachapoly.mk deleted file mode 100644 index 5ae64dcacb90..000000000000 --- a/depends/packages/crate_crypto_api_chachapoly.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_crypto_api_chachapoly -$(package)_crate_name=crypto_api_chachapoly -$(package)_version=0.2.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=95b2ad7cab08fd71addba81df5077c49df208effdfb3118a1519f9cdeac5aaf2 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_digest.mk b/depends/packages/crate_digest.mk deleted file mode 100644 index 63d7c74e1fdf..000000000000 --- a/depends/packages/crate_digest.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_digest -$(package)_crate_name=digest -$(package)_version=0.8.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_directories.mk b/depends/packages/crate_directories.mk deleted file mode 100644 index 7a3a93d53c42..000000000000 --- a/depends/packages/crate_directories.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_directories -$(package)_crate_name=directories -$(package)_version=1.0.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_fake_simd.mk b/depends/packages/crate_fake_simd.mk deleted file mode 100644 index 44331b71ab1d..000000000000 --- a/depends/packages/crate_fake_simd.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_fake_simd -$(package)_crate_name=fake-simd -$(package)_version=0.1.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_ff.mk b/depends/packages/crate_ff.mk deleted file mode 100644 index 8b7dd10841c0..000000000000 --- a/depends/packages/crate_ff.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_ff -$(package)_crate_name=ff -$(package)_version=0.5.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=44b4c77ad8a724f1ebb882af5d2d7a2ab62f4d63c8e401d40ab0de1d75262ea3 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_ff_derive.mk b/depends/packages/crate_ff_derive.mk deleted file mode 100644 index eb05c2665c83..000000000000 --- a/depends/packages/crate_ff_derive.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_ff_derive -$(package)_crate_name=ff_derive -$(package)_version=0.4.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=a9cb38a53026415988765d8d7d81b680187a77a486ba9e249dbccd5a3e74429b -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_fpe.mk b/depends/packages/crate_fpe.mk deleted file mode 100644 index 12baf031c04d..000000000000 --- a/depends/packages/crate_fpe.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_fpe -$(package)_crate_name=fpe -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=21988a326139165b75e3196bc6962ca638e5fb0c95102fbf152a3743174b01e4 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_futures.mk b/depends/packages/crate_futures.mk deleted file mode 100644 index fba10a2a4bb5..000000000000 --- a/depends/packages/crate_futures.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_futures -$(package)_crate_name=futures -$(package)_version=0.1.29 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_futures_cpupool.mk b/depends/packages/crate_futures_cpupool.mk deleted file mode 100644 index 0ff2069edb7d..000000000000 --- a/depends/packages/crate_futures_cpupool.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_futures_cpupool -$(package)_crate_name=futures-cpupool -$(package)_version=0.1.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_generic_array.mk b/depends/packages/crate_generic_array.mk deleted file mode 100644 index c84854ab8fcd..000000000000 --- a/depends/packages/crate_generic_array.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_generic_array -$(package)_crate_name=generic-array -$(package)_version=0.12.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_getrandom.mk b/depends/packages/crate_getrandom.mk deleted file mode 100644 index 460ab8b1582e..000000000000 --- a/depends/packages/crate_getrandom.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_getrandom -$(package)_crate_name=getrandom -$(package)_version=0.1.12 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_group.mk b/depends/packages/crate_group.mk deleted file mode 100644 index cfe083c0623e..000000000000 --- a/depends/packages/crate_group.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_group -$(package)_crate_name=group -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=8cbdfc48f95bef47e3daf3b9d552a1dde6311e3a5fefa43e16c59f651d56fe5b -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_hex.mk b/depends/packages/crate_hex.mk deleted file mode 100644 index f93417a30d70..000000000000 --- a/depends/packages/crate_hex.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_hex -$(package)_crate_name=hex -$(package)_version=0.3.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_lazy_static.mk b/depends/packages/crate_lazy_static.mk deleted file mode 100644 index 7487f1829a35..000000000000 --- a/depends/packages/crate_lazy_static.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_lazy_static -$(package)_crate_name=lazy_static -$(package)_version=1.4.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef \ No newline at end of file diff --git a/depends/packages/crate_libc.mk b/depends/packages/crate_libc.mk deleted file mode 100644 index a8752b964490..000000000000 --- a/depends/packages/crate_libc.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_libc -$(package)_crate_name=libc -$(package)_version=0.2.62 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_log.mk b/depends/packages/crate_log.mk deleted file mode 100644 index 3bc1ec01aaff..000000000000 --- a/depends/packages/crate_log.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_log -$(package)_crate_name=log -$(package)_version=0.4.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_memoffset.mk b/depends/packages/crate_memoffset.mk deleted file mode 100644 index c4e9fcd27731..000000000000 --- a/depends/packages/crate_memoffset.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_memoffset -$(package)_crate_name=memoffset -$(package)_version=0.5.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_nodrop.mk b/depends/packages/crate_nodrop.mk deleted file mode 100644 index 70d589b5c8b7..000000000000 --- a/depends/packages/crate_nodrop.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_nodrop -$(package)_crate_name=nodrop -$(package)_version=0.1.13 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_num_bigint.mk b/depends/packages/crate_num_bigint.mk deleted file mode 100644 index 3b97d94f7cc1..000000000000 --- a/depends/packages/crate_num_bigint.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_num_bigint -$(package)_crate_name=num-bigint -$(package)_version=0.2.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_num_cpus.mk b/depends/packages/crate_num_cpus.mk deleted file mode 100644 index 63e07acfac73..000000000000 --- a/depends/packages/crate_num_cpus.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_num_cpus -$(package)_crate_name=num_cpus -$(package)_version=1.10.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_num_integer.mk b/depends/packages/crate_num_integer.mk deleted file mode 100644 index 5e9c455a51b4..000000000000 --- a/depends/packages/crate_num_integer.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_num_integer -$(package)_crate_name=num-integer -$(package)_version=0.1.41 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_num_traits.mk b/depends/packages/crate_num_traits.mk deleted file mode 100644 index 19d87838f3fb..000000000000 --- a/depends/packages/crate_num_traits.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_num_traits -$(package)_crate_name=num-traits -$(package)_version=0.2.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_opaque_debug.mk b/depends/packages/crate_opaque_debug.mk deleted file mode 100644 index 7c493bba3b83..000000000000 --- a/depends/packages/crate_opaque_debug.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_opaque_debug -$(package)_crate_name=opaque-debug -$(package)_version=0.2.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_pairing.mk b/depends/packages/crate_pairing.mk deleted file mode 100644 index c86cbca0aca2..000000000000 --- a/depends/packages/crate_pairing.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_pairing -$(package)_crate_name=pairing -$(package)_version=0.15.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=0ec7b64119b36952d5a0c7baf959ef061a07665751706f046f9f6f0f9d83d459 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_ppv_lite86.mk b/depends/packages/crate_ppv_lite86.mk deleted file mode 100644 index 30641f95a950..000000000000 --- a/depends/packages/crate_ppv_lite86.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_ppv_lite86 -$(package)_crate_name=ppv-lite86 -$(package)_version=0.2.5 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_proc_macro2.mk b/depends/packages/crate_proc_macro2.mk deleted file mode 100644 index 4e59111aa247..000000000000 --- a/depends/packages/crate_proc_macro2.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_proc_macro2 -$(package)_crate_name=proc-macro2 -$(package)_version=1.0.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_quote.mk b/depends/packages/crate_quote.mk deleted file mode 100644 index 48e0c8ea1645..000000000000 --- a/depends/packages/crate_quote.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_quote -$(package)_crate_name=quote -$(package)_version=1.0.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rand.mk b/depends/packages/crate_rand.mk deleted file mode 100644 index 7832db1b30f9..000000000000 --- a/depends/packages/crate_rand.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rand -$(package)_crate_name=rand -$(package)_version=0.7.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rand_chacha.mk b/depends/packages/crate_rand_chacha.mk deleted file mode 100644 index ed2953fabbe7..000000000000 --- a/depends/packages/crate_rand_chacha.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rand_chacha -$(package)_crate_name=rand_chacha -$(package)_version=0.2.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rand_core.mk b/depends/packages/crate_rand_core.mk deleted file mode 100644 index 230b257c9a10..000000000000 --- a/depends/packages/crate_rand_core.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rand_core -$(package)_crate_name=rand_core -$(package)_version=0.5.1 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rand_hc.mk b/depends/packages/crate_rand_hc.mk deleted file mode 100644 index 3d51553595df..000000000000 --- a/depends/packages/crate_rand_hc.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rand_hc -$(package)_crate_name=rand_hc -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rand_xorshift.mk b/depends/packages/crate_rand_xorshift.mk deleted file mode 100644 index 6daa22805606..000000000000 --- a/depends/packages/crate_rand_xorshift.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rand_xorshift -$(package)_crate_name=rand_xorshift -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_rustc_version.mk b/depends/packages/crate_rustc_version.mk deleted file mode 100644 index f3c7410ee5fe..000000000000 --- a/depends/packages/crate_rustc_version.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_rustc_version -$(package)_crate_name=rustc_version -$(package)_version=0.2.3 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_scopeguard.mk b/depends/packages/crate_scopeguard.mk deleted file mode 100644 index a3a778dc4592..000000000000 --- a/depends/packages/crate_scopeguard.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_scopeguard -$(package)_crate_name=scopeguard -$(package)_version=1.0.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_semver.mk b/depends/packages/crate_semver.mk deleted file mode 100644 index 2ef1ba86944a..000000000000 --- a/depends/packages/crate_semver.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_semver -$(package)_crate_name=semver -$(package)_version=0.9.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_semver_parser.mk b/depends/packages/crate_semver_parser.mk deleted file mode 100644 index 9316860ac606..000000000000 --- a/depends/packages/crate_semver_parser.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_semver_parser -$(package)_crate_name=semver-parser -$(package)_version=0.7.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_sha2.mk b/depends/packages/crate_sha2.mk deleted file mode 100644 index 344582dbb045..000000000000 --- a/depends/packages/crate_sha2.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_sha2 -$(package)_crate_name=sha2 -$(package)_version=0.8.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_syn.mk b/depends/packages/crate_syn.mk deleted file mode 100644 index 37593b2e1d4c..000000000000 --- a/depends/packages/crate_syn.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_syn -$(package)_crate_name=syn -$(package)_version=1.0.5 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_typenum.mk b/depends/packages/crate_typenum.mk deleted file mode 100644 index f02fa50018f3..000000000000 --- a/depends/packages/crate_typenum.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_typenum -$(package)_crate_name=typenum -$(package)_version=1.11.2 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_unicode_xid.mk b/depends/packages/crate_unicode_xid.mk deleted file mode 100644 index 16f7be5178d1..000000000000 --- a/depends/packages/crate_unicode_xid.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_unicode_xid -$(package)_crate_name=unicode-xid -$(package)_version=0.2.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_wasi.mk b/depends/packages/crate_wasi.mk deleted file mode 100644 index 613c52627c26..000000000000 --- a/depends/packages/crate_wasi.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_wasi -$(package)_crate_name=wasi -$(package)_version=0.7.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_winapi.mk b/depends/packages/crate_winapi.mk deleted file mode 100644 index b8f86a00b778..000000000000 --- a/depends/packages/crate_winapi.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_winapi -$(package)_crate_name=winapi -$(package)_version=0.3.8 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_winapi_i686_pc_windows_gnu.mk b/depends/packages/crate_winapi_i686_pc_windows_gnu.mk deleted file mode 100644 index ff8c5e76fb45..000000000000 --- a/depends/packages/crate_winapi_i686_pc_windows_gnu.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_winapi_i686_pc_windows_gnu -$(package)_crate_name=winapi-i686-pc-windows-gnu -$(package)_version=0.4.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk b/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk deleted file mode 100644 index 725baf00f99b..000000000000 --- a/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_winapi_x86_64_pc_windows_gnu -$(package)_crate_name=winapi-x86_64-pc-windows-gnu -$(package)_version=0.4.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_zcash_primitives.mk b/depends/packages/crate_zcash_primitives.mk deleted file mode 100644 index bbfefff49152..000000000000 --- a/depends/packages/crate_zcash_primitives.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_zcash_primitives -$(package)_crate_name=zcash_primitives -$(package)_version=0.1.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=9530749bc784c4ca0d7bf000333cec29acf94f1875ad8db088e12dfee1095d13 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/crate_zcash_proofs.mk b/depends/packages/crate_zcash_proofs.mk deleted file mode 100644 index 93a1d155594b..000000000000 --- a/depends/packages/crate_zcash_proofs.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=crate_zcash_proofs -$(package)_crate_name=zcash_proofs -$(package)_version=0.1.0 -$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) -$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate -$(package)_sha256_hash=6f12228d3bff81779e848bc7e7a68f282c717ef2f67a69e6477f4667fbb06078 -$(package)_crate_versioned_name=$($(package)_crate_name) - -define $(package)_preprocess_cmds - $(call generate_crate_checksum,$(package)) -endef - -define $(package)_stage_cmds - $(call vendor_crate_source,$(package)) -endef diff --git a/depends/packages/rust.mk b/depends/packages/native_rust.mk similarity index 96% rename from depends/packages/rust.mk rename to depends/packages/native_rust.mk index f9f0bac88093..810fb65520ee 100644 --- a/depends/packages/rust.mk +++ b/depends/packages/native_rust.mk @@ -1,4 +1,4 @@ -package=rust +package=native_rust $(package)_version=1.42.0 $(package)_download_path=https://depends.pivx.org $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz @@ -55,12 +55,12 @@ define $(package)_extract_cmds endef define $(package)_stage_cmds - bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig && \ - ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig + bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig && \ + ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig endef else define $(package)_stage_cmds - bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig + bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig endef endif diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 8a3a63a1b790..20f6f0152eb7 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,78 +1,5 @@ -rust_crates := \ - crate_aes \ - crate_aesni \ - crate_aes_soft \ - crate_arrayref \ - crate_arrayvec \ - crate_autocfg \ - crate_bellman \ - 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_ff_derive \ - crate_ff \ - crate_fpe \ - crate_futures_cpupool \ - crate_futures \ - crate_generic_array \ - crate_getrandom \ - crate_group \ - 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_pairing \ - crate_ppv_lite86 \ - crate_proc_macro2 \ - crate_quote \ - crate_rand_chacha \ - crate_rand_core \ - crate_rand_hc \ - 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 \ - crate_zcash_primitives \ - crate_zcash_proofs - -rust_packages := rust $(rust_crates) packages:=boost libevent gmp $(zcash_packages) libsodium +native_packages := native_rust qt_packages = qrencode zlib diff --git a/rust-toolchain b/rust-toolchain index 39fc130ef857..a50908ca3daf 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.36.0 +1.42.0 From 7dd7161bbed892448620f5845deffc3c1dfea1f1 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Tue, 9 Mar 2021 20:14:51 -0800 Subject: [PATCH 2/3] Depends: allow for non-x86_64 build hosts for rust linux --- depends/packages/native_rust.mk | 38 +++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk index 810fb65520ee..73e1f6b4d250 100644 --- a/depends/packages/native_rust.mk +++ b/depends/packages/native_rust.mk @@ -1,12 +1,16 @@ package=native_rust $(package)_version=1.42.0 $(package)_download_path=https://depends.pivx.org -$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_linux=5fed7d705e215fc129c4ace8060b5dc1a47e88228ce0249d48f30d769fcb6fe3 -$(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz -$(package)_sha256_hash_darwin=db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8 -$(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz -$(package)_sha256_hash_freebsd=230bcf17e4383fba85d3c87fe25d17737459fe561a5f4668fe70dcac2da4e17c +$(package)_file_name_x86_64_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz +$(package)_sha256_hash_x86_64_linux=5fed7d705e215fc129c4ace8060b5dc1a47e88228ce0249d48f30d769fcb6fe3 +$(package)_file_name_arm_linux=rust-$($(package)_version)-arm-unknown-linux-gnueabihf.tar.gz +$(package)_sha256_hash_arm_linux=fbcec54ecaa7deb6f99952ac1f93421b5275198aae1a5801c8cdebf015e28c39 +$(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz +$(package)_sha256_hash_aarch64_linux=fde59dd0468de0cf1a210a7673b1bb147da142e624a99831ed10662cf0056df5 +$(package)_file_name_x86_64_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz +$(package)_sha256_hash_x86_64_darwin=db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8 +$(package)_file_name_x86_64_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz +$(package)_sha256_hash_x86_64_freebsd=230bcf17e4383fba85d3c87fe25d17737459fe561a5f4668fe70dcac2da4e17c # Mapping from GCC canonical hosts to Rust targets # If a mapping is not present, we assume they are identical, unless $host_os is @@ -36,22 +40,22 @@ $(package)_rust_target=$(call rust_target,$(package),$(canonical_host),$(host_os $(package)_exact_file_name=rust-std-$($(package)_version)-$($(package)_rust_target).tar.gz $(package)_exact_sha256_hash=$($(package)_rust_std_sha256_hash_$($(package)_rust_target)) $(package)_build_subdir=buildos -$(package)_extra_sources=$($(package)_file_name_$(build_os)) +$(package)_extra_sources=$($(package)_file_name_$(build_arch)_$(build_os)) define $(package)_fetch_cmds $(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \ -$(call fetch_file,$(package),$($(package)_download_path),$($(package)_file_name_$(build_os)),$($(package)_file_name_$(build_os)),$($(package)_sha256_hash_$(build_os))) +$(call fetch_file,$(package),$($(package)_download_path),$($(package)_file_name_$(build_arch)_$(build_os)),$($(package)_file_name_$(build_arch)_$(build_os)),$($(package)_sha256_hash_$(build_arch)_$(build_os))) endef define $(package)_extract_cmds mkdir -p $($(package)_extract_dir) && \ echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \ - echo "$($(package)_sha256_hash_$(build_os)) $($(package)_source_dir)/$($(package)_file_name_$(build_os))" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ + echo "$($(package)_sha256_hash_$(build_arch)_$(build_os)) $($(package)_source_dir)/$($(package)_file_name_$(build_arch)_$(build_os))" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \ mkdir $(canonical_host) && \ tar --strip-components=1 -xf $($(package)_source) -C $(canonical_host) && \ mkdir buildos && \ - tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_file_name_$(build_os)) -C buildos + tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_file_name_$(build_arch)_$(build_os)) -C buildos endef define $(package)_stage_cmds @@ -60,7 +64,19 @@ define $(package)_stage_cmds endef else +define $(package)_fetch_cmds +$(call fetch_file,$(package),$($(package)_download_path),$($(package)_file_name_$(build_arch)_$(build_os)),$($(package)_file_name_$(build_arch)_$(build_os)),$($(package)_sha256_hash_$(build_arch)_$(build_os))) +endef + +define $(package)_extract_cmds + mkdir -p $($(package)_extract_dir) && \ + echo "$($(package)_sha256_hash_$(build_arch)_$(build_os)) $($(package)_source_dir)/$($(package)_file_name_$(build_arch)_$(build_os))" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ + $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \ + mkdir $(canonical_host) && \ + tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_file_name_$(build_arch)_$(build_os)) -C $(canonical_host) +endef + define $(package)_stage_cmds - bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig + bash ./$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig endef endif From 92bebbe93041c84d88ac0da0ae433f3c47270f5b Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Tue, 30 Mar 2021 21:19:28 -0700 Subject: [PATCH 3/3] Use statically linked rust toolchain Rebuilt linux rust toolchains for static linking. This removes the host dependency on OpenSSL 1.1 --- depends/packages/native_rust.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk index 73e1f6b4d250..7e116c9bcb20 100644 --- a/depends/packages/native_rust.mk +++ b/depends/packages/native_rust.mk @@ -2,11 +2,13 @@ package=native_rust $(package)_version=1.42.0 $(package)_download_path=https://depends.pivx.org $(package)_file_name_x86_64_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_x86_64_linux=5fed7d705e215fc129c4ace8060b5dc1a47e88228ce0249d48f30d769fcb6fe3 +$(package)_sha256_hash_x86_64_linux=fce33280b344ab0fecc55be24632a3c0086fd763f4df1d59013dfc0e49f0356c $(package)_file_name_arm_linux=rust-$($(package)_version)-arm-unknown-linux-gnueabihf.tar.gz -$(package)_sha256_hash_arm_linux=fbcec54ecaa7deb6f99952ac1f93421b5275198aae1a5801c8cdebf015e28c39 +$(package)_sha256_hash_arm_linux=a19a1d46fa08681429d888ec06e127ce94ac16d7d95d3f1ee586a0cac63ffe5b +$(package)_file_name_armv7l_linux=rust-$($(package)_version)-armv7-unknown-linux-gnueabihf.tar.gz +$(package)_sha256_hash_armv7l_linux=9476f34dc6a957524ea6034005fa493659c45c2b1048c7a50a03d8fc0a06f7f1 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_aarch64_linux=fde59dd0468de0cf1a210a7673b1bb147da142e624a99831ed10662cf0056df5 +$(package)_sha256_hash_aarch64_linux=a8fc3d4c626fab76b16fc6f875118a8d4cd6a1e3a4c9a98497e45f1c5429b9c6 $(package)_file_name_x86_64_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz $(package)_sha256_hash_x86_64_darwin=db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8 $(package)_file_name_x86_64_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz @@ -21,13 +23,14 @@ $(package)_rust_target_riscv64-linux-gnu=riscv64gc-unknown-linux-gnu $(package)_rust_target_riscv64-unknown-linux-gnu=riscv64gc-unknown-linux-gnu $(package)_rust_target_x86_64-linux-gnu=x86_64-unknown-linux-gnu $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu +$(package)_rust_target_armv7l-unknown-linux-gnueabihf=arm-unknown-linux-gnueabihf # Mapping from Rust targets to SHA-256 hashes -$(package)_rust_std_sha256_hash_arm-unknown-linux-gnueabihf=f91d28115a46eb9af5bb73bb776269534e02add1125346b2dd7e29ecf34da892 -$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=782b2ab52d062ecc7077ddbfff1f21b553ac21845688a75aed45d70214a3c3e7 -$(package)_rust_std_sha256_hash_i686-unknown-linux-gnu=58191b8ccc78bbd288285a8e9b03c5e473ffbdf9d79c7262130202454f17c41f -$(package)_rust_std_sha256_hash_x86_64-unknown-linux-gnu=016c9619bdbb8023876579ed97ade2f8b049696c2163f7518328b77b2c274f25 -$(package)_rust_std_sha256_hash_riscv64gc-unknown-linux-gnu=5496c43c340dfbef0a335498752e4efeff4534ada9a96754d9660be98ae8dc41 +$(package)_rust_std_sha256_hash_arm-unknown-linux-gnueabihf=538790218a9515ef8e32c29a3f6d0d242281345fc8a5f0b0e1452bd350633e15 +$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=0d32e9600074b0b5e741d154dc72874e598a34e3b33818a0dc9d7a2243d75b7a +$(package)_rust_std_sha256_hash_i686-unknown-linux-gnu=5bc82c00a62f5da9d3b6573a9880b1aa163cc524a02579a04a0889abc3020fc9 +$(package)_rust_std_sha256_hash_x86_64-unknown-linux-gnu=face97f81c746b884ac9a6062b2ac99b1f4c314199d0a90c57a0adb0a01dcdc8 +$(package)_rust_std_sha256_hash_riscv64gc-unknown-linux-gnu=4029ef6a767018af3a32f7ffa5aeef728dc763fc541e95395cf9924c1b9ca6f0 $(package)_rust_std_sha256_hash_x86_64-apple-darwin=1d61e9ed5d29e1bb4c18e13d551c6d856c73fb8b410053245dc6e0d3b3a0e92c $(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=8a8389f3860df6f42fbf8b76a62ddc7b9b6fe6d0fb526dcfc42faab1005bfb6d