Major updates integration from all upstreams
This commit is contained in:
@@ -5,6 +5,11 @@ $(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)"
|
||||
@@ -19,9 +24,10 @@ define $(package)_build_cmds
|
||||
endef
|
||||
else
|
||||
$(package)_install=install
|
||||
|
||||
define $(package)_build_cmds
|
||||
$(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \
|
||||
$(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a
|
||||
$(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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user