DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade googletest to 1.8.0

Browse Source
This commit is contained in:
syd
2017-11-19 14:08:17 -05:00
parent 05207b865c
commit 24902602f2
3 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
depends/packages/googlemock.mk
View File

@@ -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

13
depends/packages/googletest.mk
View File

@@ -1,15 +1,18 @@
package=googletest package=googletest
$(package)_version=1.7.0 $(package)_version=1.8.0
$(package)_download_path=https://github.com/google/$(package)/archive/ $(package)_download_path=https://github.com/google/$(package)/archive/
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_download_file=release-$($(package)_version).tar.gz $(package)_download_file=release-$($(package)_version).tar.gz
$(package)_sha256_hash=f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc $(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
define $(package)_build_cmds 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 endef
define $(package)_stage_cmds define $(package)_stage_cmds
install -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \ install -D ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
cp -a ./include $($(package)_staging_dir)$(host_prefix)/include 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 endef

2
depends/packages/packages.mk
View File

@@ -1,7 +1,7 @@
rust_packages := rust librustzcash rust_packages := rust librustzcash
proton_packages := proton proton_packages := proton
zcash_packages := libgmp libsodium 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 native_packages := native_ccache
wallet_packages=bdb wallet_packages=bdb