From aa01b17862ab3af9d95a05018bf8ccf5e875057b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 10 Feb 2022 20:14:00 +0100 Subject: [PATCH] package/gtest: drop python2 host support And simplify the package a bit while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 673e626c45..e7ce89a3f4 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -19,16 +19,7 @@ endif HOST_GTEST_LICENSE = Apache-2.0 HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_GTEST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) -HOST_GTEST_DEPENDENCIES += host-python3 -else -HOST_GTEST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) -HOST_GTEST_DEPENDENCIES += host-python -endif - -HOST_GTEST_GMOCK_PYTHONPATH = \ - $(HOST_DIR)/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages +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 @@ -56,7 +47,7 @@ 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_GTEST_GMOCK_PYTHONPATH) + $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages endef HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON