Remove ate-pairing, xbyak and libzerocash dependencies from the depends tree.
The ALT_BN128 curve does not need ate-pairing or xbyak. Also, remove crypto++ dependency from libsnark.
This commit is contained in:
parent
523bc77f64
commit
1e62bba762
|
@ -1,17 +0,0 @@
|
||||||
package=ate-pairing
|
|
||||||
$(package)_version=0.1
|
|
||||||
$(package)_download_path=https://github.com/herumi/$(package)/archive/
|
|
||||||
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_download_file=$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_sha256_hash=37c05b4a60653b912a0130d77ac816620890d65a51dd9629ed65c15b54c2d8e0
|
|
||||||
$(package)_dependencies=xbyak libgmp
|
|
||||||
|
|
||||||
$(package)_git_commit=dd7889f2881e66f87165fcd180a03cf659bcb073
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
$(MAKE) -j SUPPORT_SNARK=1 INC_DIR='-I../include $($(package)_cppflags)' LIB_DIR='-L../lib $($(package)_ldflags)'
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
cp -rv include/ lib/ $($(package)_staging_dir)$(host_prefix)
|
|
||||||
endef
|
|
|
@ -6,7 +6,7 @@ $(package)_download_file=$($(package)_git_commit).tar.gz
|
||||||
$(package)_sha256_hash=b5ec84a836d0d305407d5f39c8176bae2bb448abe802a8d11ba0f88f17e6d358
|
$(package)_sha256_hash=b5ec84a836d0d305407d5f39c8176bae2bb448abe802a8d11ba0f88f17e6d358
|
||||||
$(package)_git_commit=69f312f149cc4bd8def8e2fed26a7941ff41251d
|
$(package)_git_commit=69f312f149cc4bd8def8e2fed26a7941ff41251d
|
||||||
|
|
||||||
$(package)_dependencies=crypto++ libgmp xbyak ate-pairing
|
$(package)_dependencies=libgmp
|
||||||
$(package)_patches=1_fix_Wl_flag.patch
|
$(package)_patches=1_fix_Wl_flag.patch
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
define $(package)_preprocess_cmds
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
package=libzerocash
|
|
||||||
$(package)_download_path=https://github.com/Electric-Coin-Company/$(package)/archive/
|
|
||||||
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_download_file=$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_sha256_hash=1364a739751bcdda86cfd66d3d019844d116c374d7a7634bfb3e1a47c085f3c0
|
|
||||||
$(package)_git_commit=dd5db5815be70f0e4895784cc905df6f1c73cb17
|
|
||||||
|
|
||||||
$(package)_dependencies=libsnark crypto++ openssl boost libgmp
|
|
||||||
$(package)_patches=
|
|
||||||
|
|
||||||
# FIXME: How do we know, at the point where the _build_cms are run, that the
|
|
||||||
# $(host_prefix)/include/libsnark folder is there? The lifecycle of that folder
|
|
||||||
# is as follows:
|
|
||||||
# 1. First, the _stage_cmds of libsnark.mk create it in the staging directory.
|
|
||||||
# 2. At some point in time, the depends system moves it from the staging
|
|
||||||
# directory to the actual $(host_prefix)/include/libsnark directory.
|
|
||||||
#
|
|
||||||
# If (2) happens after the libzerocash_build_cmds get run, then what's in the
|
|
||||||
# $(host_prefix)/include/libsnark directory will be an *old* copy of the
|
|
||||||
# libsnark headers, and we might have to build twice in order for libzerocash to
|
|
||||||
# get the changes. If (2) happens before, then all is well, and it works.
|
|
||||||
#
|
|
||||||
# ** Which is it? **
|
|
||||||
#
|
|
||||||
$(package)_cppflags += -I$(BASEDIR)/../src -I. -I$(host_prefix)/include -I$(host_prefix)/include/libsnark -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -std=c++11 -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -fPIC
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
$(MAKE) all DEPINST=$(host_prefix) CXXFLAGS="$($(package)_cppflags)" STATIC=1 MINDEPS=1 USE_MT=1 LINK_RT=1
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
$(MAKE) install DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) STATIC=1 MINDEPS=1 USE_MT=1
|
|
||||||
endef
|
|
|
@ -1,4 +1,4 @@
|
||||||
zerocash_packages := libsnark crypto++ libgmp xbyak ate-pairing libzerocash
|
zerocash_packages := libsnark crypto++ libgmp
|
||||||
packages:=boost openssl $(zerocash_packages)
|
packages:=boost openssl $(zerocash_packages)
|
||||||
native_packages := native_ccache native_comparisontool
|
native_packages := native_ccache native_comparisontool
|
||||||
|
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
package=xbyak
|
|
||||||
$(package)_version=0.1
|
|
||||||
$(package)_download_path=https://github.com/herumi/$(package)/archive/
|
|
||||||
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_download_file=$($(package)_git_commit).tar.gz
|
|
||||||
$(package)_sha256_hash=467a9037c29bc417840177f3ff5d76910d3f688f2f216dd86ced4a7ac837bfb0
|
|
||||||
$(package)_dependencies=
|
|
||||||
|
|
||||||
$(package)_git_commit=62fd6d022acd83209e2a5af8ec359a3a1bed3a50
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
echo 'xbyak build is unnecessary for consumer ate-pairing.'
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
$(MAKE) install PREFIX=$($(package)_staging_dir)$(host_prefix)
|
|
||||||
endef
|
|
Loading…
Reference in New Issue