diff --git a/depends/packages/bls-dash.mk b/depends/packages/bls-dash.mk index 74f45b8f61..a8ab821885 100644 --- a/depends/packages/bls-dash.mk +++ b/depends/packages/bls-dash.mk @@ -1,20 +1,19 @@ package=bls-dash -$(package)_version=1.1.0 +$(package)_version=1.2.0 $(package)_download_path=https://github.com/dashpay/bls-signatures/archive $(package)_download_file=$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_download_file) $(package)_build_subdir=build -$(package)_sha256_hash=276c8573104e5f18bb5b9fd3ffd49585dda5ba5f6de2de74759dda8ca5a9deac +$(package)_sha256_hash=94e49f3eaa29bc1f354cd569c00f4f4314d1c8ab4758527c248b67da9686135a $(package)_dependencies=gmp cmake -$(package)_patches=gcc_alignment_cast.patch $(package)_darwin_triplet=x86_64-apple-darwin19 -$(package)_relic_version=3a23142be0a5510a3aa93cd6c76fc59d3fc732a5 +$(package)_relic_version=aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 $(package)_relic_download_path=https://github.com/relic-toolkit/relic/archive $(package)_relic_download_file=$($(package)_relic_version).tar.gz -$(package)_relic_file_name=relic-toolkit-$($(package)_relic_download_file) +$(package)_relic_file_name=relic-$($(package)_relic_download_file) $(package)_relic_build_subdir=relic -$(package)_relic_sha256_hash=ddad83b1406985a1e4703bd03bdbab89453aa700c0c99567cf8de51c205e5dde +$(package)_relic_sha256_hash=f2de6ebdc9def7077f56c83c8b06f4da5bacc36b709514bd550a92a149e9fa1d $(package)_extra_sources=$($(package)_relic_file_name) @@ -56,13 +55,8 @@ define $(package)_set_vars endef define $(package)_preprocess_cmds - sed -i.old "s|GIT_REPOSITORY https://github.com/relic-toolkit/relic.git|URL \"../../relic-toolkit-$($(package)_relic_version).tar.gz\"|" src/CMakeLists.txt && \ - sed -i.old "s|GIT_TAG .*RELIC_GIT_TAG.*||" src/CMakeLists.txt && \ - tar xzf relic-toolkit-$($(package)_relic_version).tar.gz relic-$($(package)_relic_version)/src/md/blake2.h && \ - patch -p1 relic-$($(package)_relic_version)/src/md/blake2.h < $($(package)_patch_dir)/gcc_alignment_cast.patch && \ - gunzip relic-toolkit-$($(package)_relic_version).tar.gz && \ - tar rf relic-toolkit-$($(package)_relic_version).tar relic-$($(package)_relic_version)/src/md/blake2.h && \ - gzip relic-toolkit-$($(package)_relic_version).tar + sed -i.old "s|GIT_REPOSITORY https://github.com/Chia-Network/relic.git|URL \"../../relic-$($(package)_relic_version).tar.gz\"|" CMakeLists.txt && \ + sed -i.old "s|RELIC_GIT_TAG \".*\"|RELIC_GIT_TAG \"\"|" CMakeLists.txt endef define $(package)_config_cmds diff --git a/depends/packages/cmake.mk b/depends/packages/cmake.mk index 8e49ed13fe..cc895de79a 100644 --- a/depends/packages/cmake.mk +++ b/depends/packages/cmake.mk @@ -1,13 +1,13 @@ package=cmake -$(package)_version=3.14.7 -$(package)_download_path=https://cmake.org/files/v3.14/ +$(package)_version=3.22.2 +$(package)_download_path=https://cmake.org/files/v3.22/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=9221993e0af3e6d10124d840ff24f5b2f3b884416fca04d3312cb0388dec1385 +$(package)_sha256_hash=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced define $(package)_config_cmds export CC="" && \ export CXX="" && \ - ./bootstrap --prefix=$(host_prefix) + ./bootstrap --prefix=$(host_prefix) -- -DCMAKE_USE_OPENSSL=OFF endef define $(package)_build_cmds diff --git a/depends/patches/bls-dash/gcc_alignment_cast.patch b/depends/patches/bls-dash/gcc_alignment_cast.patch deleted file mode 100644 index 063b7dd71b..0000000000 --- a/depends/patches/bls-dash/gcc_alignment_cast.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> -Date: Thu, 2 Sep 2021 00:18:25 +0530 -Subject: [PATCH] Resolve "not a multiple of its alignment" build error - ---- - src/md/blake2.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/md/blake2.h -+++ b/src/md/blake2.h -@@ -137,8 +137,8 @@ extern "C" { - - /* Padded structs result in a compile-time error */ - enum { -+ BLAKE2_DUMMY_1 = 1/(int)(sizeof(blake2s_param) == BLAKE2S_OUTBYTES), -+ BLAKE2_DUMMY_2 = 1/(int)(sizeof(blake2b_param) == BLAKE2B_OUTBYTES) -- BLAKE2_DUMMY_1 = 1/(sizeof(blake2s_param) == BLAKE2S_OUTBYTES), -- BLAKE2_DUMMY_2 = 1/(sizeof(blake2b_param) == BLAKE2B_OUTBYTES) - }; - - /* Streaming API */ diff --git a/src/Makefile.am b/src/Makefile.am index fc8a965be5..11cce20ee7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFL BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) -BLS_LIBS=-lbls-dash +BLS_LIBS=-lbls-dash -lrelic_s LIBBITCOIN_SERVER=libdash_server.a LIBBITCOIN_COMMON=libdash_common.a