Test

depends/packages/googletest.mk

@@ -25,14 +25,9 @@ endef
 endif
 
 define $(package)_stage_cmds
-<<<<<<< HEAD
-  $($(package)_install) -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
-  cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
-=======
   mkdir -p $($(package)_staging_dir)$(host_prefix)/lib && \
   install ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
   install ./googletest/make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
   cp -a ./googlemock/include $($(package)_staging_dir)$(host_prefix)/ && \
   cp -a ./googletest/include $($(package)_staging_dir)$(host_prefix)/
->>>>>>> zcash/master
 endef

depends/packages/libsodium.mk

@@ -1,15 +1,15 @@
 package=libsodium
-<<<<<<< HEAD
-$(package)_version=1.0.11
-$(package)_download_path=https://supernetorg.bintray.com/misc
-$(package)_file_name=libsodium-1.0.11.tar.gz
-$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
-=======
+#<<<<<<< HEAD
+#$(package)_version=1.0.11
+#$(package)_download_path=https://supernetorg.bintray.com/misc
+#$(package)_file_name=libsodium-1.0.11.tar.gz
+#$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
+#=======
 $(package)_version=1.0.15
 $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
->>>>>>> zcash/master
+#>>>>>>> zcash/master
 $(package)_dependencies=
 $(package)_config_opts=
 

depends/packages/packages.mk

@@ -1,19 +1,13 @@
 rust_packages := rust librustzcash
-<<<<<<< HEAD
-zcash_packages := libsnark libgmp libsodium
 
+proton_packages := proton
+zcash_packages := libgmp libsodium
 ifeq ($(host_os),linux)
 	packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
 else
 	packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock libcurl
 endif
 
-
-=======
-proton_packages := proton
-zcash_packages := libgmp libsodium
-packages := boost openssl libevent zeromq $(zcash_packages) googletest
->>>>>>> zcash/master
 native_packages := native_ccache
 
 wallet_packages=bdb

depends/packages/rust.mk

@@ -1,23 +1,23 @@
 package=rust
 $(package)_version=1.16.0
 $(package)_download_path=https://static.rust-lang.org/dist
-<<<<<<< HEAD
-ifeq ($(build_os),darwin)
-$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
-else ifeq ($(host_os),mingw32)
-$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
-else
-$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
-endif
-=======
+#<<<<<<< HEAD
+#ifeq ($(build_os),darwin)
+#$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
+#$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
+#else ifeq ($(host_os),mingw32)
+#$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
+#$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
+#else
+#$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
+#$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+#endif
+#=======
 $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
 $(package)_sha256_hash_linux=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
 $(package)_sha256_hash_darwin=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
->>>>>>> zcash/master
+#>>>>>>> zcash/master
 
 define $(package)_stage_cmds
   ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig