From 24902602f2f695a85dd364836b041ce5ec0a2565 Mon Sep 17 00:00:00 2001
From: syd <sydo@protonmail.com>
Date: Sun, 19 Nov 2017 14:08:17 -0500
Subject: [PATCH] Upgrade googletest to 1.8.0

---
 depends/packages/googlemock.mk | 20 --------------------
 depends/packages/googletest.mk | 13 ++++++++-----
 depends/packages/packages.mk   |  2 +-
 3 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 depends/packages/googlemock.mk

diff --git a/depends/packages/googlemock.mk b/depends/packages/googlemock.mk
deleted file mode 100644
index 229dc3587..000000000
--- a/depends/packages/googlemock.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# url=https://github.com/google/googlemock/archive/release-1.7.0.tar.gz
-
-package=googlemock
-$(package)_version=1.7.0
-$(package)_dependencies=googletest
-
-$(package)_download_path=https://github.com/google/$(package)/archive/
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_download_file=release-$($(package)_version).tar.gz
-$(package)_sha256_hash=3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232
-
-define $(package)_build_cmds
-  $(MAKE) -C make GTEST_DIR='$(host_prefix)' CXXFLAGS='-fPIC' gmock-all.o
-endef
-
-
-define $(package)_stage_cmds
-  install -D ./make/gmock-all.o $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
-  cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
-endef
diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk
index 5133e64a1..94880efdb 100644
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -1,15 +1,18 @@
 package=googletest
-$(package)_version=1.7.0
+$(package)_version=1.8.0
 $(package)_download_path=https://github.com/google/$(package)/archive/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=release-$($(package)_version).tar.gz
-$(package)_sha256_hash=f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc
+$(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
 
 define $(package)_build_cmds
-  $(MAKE) -C make CXXFLAGS=-fPIC gtest.a
+  $(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \
+  $(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a
 endef
 
 define $(package)_stage_cmds
-  install -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
-  cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
+  install -D ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
+  install -D ./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)/
 endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 0b7905e4f..296323c8c 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,7 +1,7 @@
 rust_packages := rust librustzcash
 proton_packages := proton
 zcash_packages := libgmp libsodium
-packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
+packages := boost openssl libevent zeromq $(zcash_packages) googletest
 native_packages := native_ccache
 
 wallet_packages=bdb