From 85566d89f8ddc6764d155717f80336806ac0708c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 12 Jul 2022 22:31:51 +0200 Subject: [PATCH] package/gtest: drop host-gtest Drop host-gtest to avoid the following build failure raised since bump to version 1.12.0 in commit a336b731af5979a25213b33c5840de6d1ed88bdc and https://github.com/google/googletest/commit/6202251f0963187a7781f181365cf8c19bf343d5: /usr/bin/install -D -m 0755 /home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/gmock_gen /usr/bin/install: cannot stat '/home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py': No such file or directory Fixes: - http://autobuild.buildroot.org/results/6a8fb259760f84c67a3482cc5964c6610f9b70a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 16a8c68b2103e36c491712e4697b945a6684874f) Signed-off-by: Peter Korsgaard --- package/gtest/Config.in | 9 --------- package/gtest/gtest.mk | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/package/gtest/Config.in b/package/gtest/Config.in index 4355e9c9c5..4591cb5e48 100644 --- a/package/gtest/Config.in +++ b/package/gtest/Config.in @@ -26,7 +26,6 @@ if BR2_PACKAGE_GTEST config BR2_PACKAGE_GTEST_GMOCK bool "gmock" - depends on BR2_HOST_GCC_AT_LEAST_5 # host-gtest help Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s specifics in mind, Google C++ Mocking Framework (or @@ -43,14 +42,6 @@ config BR2_PACKAGE_GTEST_GMOCK * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and Symbian. - There are both host and target packages. The target one has - include files required to compile the tests and the static - libraries required to link/run them. The host package installs - gmock_gen, a Python script used to generate code mocks. - -comment "gmock needs host gcc >= 5" - depends on !BR2_HOST_GCC_AT_LEAST_5 - endif # BR2_PACKAGE_GTEST comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5" diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index f3f3f9c296..236c8f3730 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -13,10 +13,6 @@ GTEST_LICENSE_FILES = LICENSE GTEST_CPE_ID_VENDOR = google GTEST_CPE_ID_PRODUCT = google_test -HOST_GTEST_LICENSE = Apache-2.0 -HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE -HOST_GTEST_DEPENDENCIES = host-python3 - # While it is possible to build gtest as shared library, using this gtest shared # library requires to set some special configure option in the project using # gtest. @@ -34,20 +30,9 @@ GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -GTEST_DEPENDENCIES += host-gtest GTEST_CONF_OPTS += -DBUILD_GMOCK=ON else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif -define HOST_GTEST_POST_INSTALL_PYTHON - $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ - $(HOST_DIR)/bin/gmock_gen - cp -rp $(@D)/googlemock/scripts/generator/cpp \ - $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -endef - -HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON - $(eval $(cmake-package)) -$(eval $(host-cmake-package))