Merge branch 'duke' into dev

Conflicts:
	src/chainparams.cpp
    src/primitives/block.h
This commit is contained in:
Duke Leto
2019-12-26 20:50:50 -05:00
330 changed files with 6573 additions and 47633 deletions

View File

@@ -1,11 +1,10 @@
package=libsodium
$(package)_version=1.0.15
$(package)_download_path=https://github.com/jedisct1/libsodium/releases/download/1.0.15
$(package)_version=1.0.18
$(package)_download_path=https://github.com/MyHush/libsodium/releases/download/$($(package)_version)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
$(package)_dependencies=
$(package)_config_opts=
ifeq ($(build_os),darwin)
define $(package)_set_vars
$(package)_build_env=MACOSX_DEPLOYMENT_TARGET="10.11"

View File

@@ -1,5 +1,5 @@
$(package)_version=3.1
$(package)_download_path=https://github.com/nemtrif/$(package)/archive/
$(package)_download_path=https://github.com/MyHush/$(package)/archive/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_download_file=v$($(package)_version).tar.gz
$(package)_sha256_hash=ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096