Merge branch 'master' into dev

This commit is contained in:
Duke Leto
2021-01-27 13:42:38 -05:00
2 changed files with 4 additions and 4 deletions

View File

@@ -1,11 +1,11 @@
package=libgmp package=libgmp
ifeq ($(host_os),mingw32) ifeq ($(host_os),mingw32)
$(package)_download_path=https://github.com/joshuayabut/$(package)/archive $(package)_download_path=https://github.com/radix42/$(package)/archive
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
$(package)_download_file=$($(package)_git_commit).tar.gz $(package)_download_file=$($(package)_git_commit).tar.gz
$(package)_sha256_hash=193836c1acc9dc00fe2521205d7bbe1ba13263f6cbef6f02584bf6f8b34b108f $(package)_sha256_hash=67df06ed50f288bd7b1ec6907973684fb7cf1196f2cb368b59d423e42b065e40
$(package)_git_commit=053c03b1cab347671d936f43ef66b48ab5e380ee $(package)_git_commit=42ba95387cdfd67399f7aac52fddb8d6e1258ee6
$(package)_dependencies= $(package)_dependencies=
$(package)_config_opts=--enable-cxx --disable-shared $(package)_config_opts=--enable-cxx --disable-shared
else ifeq ($(build_os),darwin) else ifeq ($(build_os),darwin)

View File

@@ -41,6 +41,6 @@ wallet_packages=bdb
ifeq ($(host_os),linux) ifeq ($(host_os),linux)
packages := boost wolfssl libevent zeromq $(zcash_packages) googletest libcurl #googlemock packages := boost wolfssl libevent zeromq $(zcash_packages) googletest libcurl #googlemock
else else
packages := boost wolfssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock packages := boost wolfssl libevent $(zcash_packages) libcurl googletest #googlemock
endif endif