From 61513966c2c18fa81c9fb14707ec8c3de4096523 Mon Sep 17 00:00:00 2001 From: Duke Date: Tue, 3 Mar 2026 18:47:26 -0500 Subject: [PATCH] Remove googlemock and googletest deps --- depends/packages/googlemock.mk | 33 ---------------------------- depends/packages/googletest.mk | 40 ---------------------------------- depends/packages/packages.mk | 4 ++-- 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 depends/packages/googlemock.mk delete mode 100644 depends/packages/googletest.mk diff --git a/depends/packages/googlemock.mk b/depends/packages/googlemock.mk deleted file mode 100644 index 7230e8958..000000000 --- a/depends/packages/googlemock.mk +++ /dev/null @@ -1,33 +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 - -ifeq ($(build_os),darwin) -define $(package)_set_vars - $(package)_build_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" -endef -endif - -ifeq ($(build_os),darwin) -$(package)_install=ginstall -define $(package)_build_cmds - $(MAKE) -C make GTEST_DIR='$(host_prefix)' gmock-all.o -endef -else -$(package)_install=install -define $(package)_build_cmds - $(MAKE) -C make GTEST_DIR='$(host_prefix)' CXXFLAGS='-fPIC' gmock-all.o -endef -endif - -define $(package)_stage_cmds - $($(package)_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 deleted file mode 100644 index 00ee3f23b..000000000 --- a/depends/packages/googletest.mk +++ /dev/null @@ -1,40 +0,0 @@ -package=googletest -$(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=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 - -define $(package)_set_vars -$(package)_cxxflags+=-std=c++11 -$(package)_cxxflags_linux=-fPIC -endef - -ifeq ($(build_os),darwin) -define $(package)_set_vars - $(package)_build_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" -endef -endif - -ifeq ($(build_os),darwin) -$(package)_install=ginstall -define $(package)_build_cmds - $(MAKE) -C googlemock/make gmock.a && \ - $(MAKE) -C googletest/make gtest.a -endef -else -$(package)_install=install - -define $(package)_build_cmds - $(MAKE) -C googlemock/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \ - $(MAKE) -C googletest/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gtest.a -endef -endif - -define $(package)_stage_cmds - 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)/ -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index c39adbf30..3e2363e42 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -39,8 +39,8 @@ native_packages := native_ccache wallet_packages=bdb ifeq ($(host_os),linux) - packages := boost wolfssl libevent $(zcash_packages) libcurl #googlemock googletest + packages := boost wolfssl libevent $(zcash_packages) libcurl else - packages := boost wolfssl libevent $(zcash_packages) libcurl #googlemock googletest + packages := boost wolfssl libevent $(zcash_packages) libcurl endif