NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gtest: bump to version 1.11.0

Browse Source 
Python is removed as dependency.
gtest uses python for self-tests which are not run by buildroot,
and the remaining scripts are not used by the build, and aren't
maintained or supported.

Special handling for gtest-config and gmock-config is removed as well,
the CMake Buildsystem now does take care of those.

Signed-off-by: Norbert Lange <nolange79@gmail.com>
[Arnout: still install gmock_gen.py]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Norbert Lange 2021-07-08 16:59:46 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent d5ce3b5db5
commit 9dfbbbb410
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gtest/gtest.hash
View File

@ -1,3 +1,3 @@
# Locally computed:
sha256 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb gtest-1.10.0.tar.gz
sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE
sha256 b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 gtest-1.11.0.tar.gz
sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE

40
package/gtest/gtest.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GTEST_VERSION = 1.10.0
GTEST_VERSION = 1.11.0
GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION))
GTEST_INSTALL_STAGING = YES
GTEST_INSTALL_TARGET = NO
@ -21,10 +21,8 @@ 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 = \
@ -48,44 +46,8 @@ endif
GTEST_CONF_OPTS += -DBUILD_GTEST=ON
# Generate the gtest-config script manually, since the CMake build system is
# not doing it.
define GTEST_INSTALL_GTEST_CONFIG
sed 's%@PACKAGE_TARNAME@%gtest%;\
s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\
s%@prefix@%$(STAGING_DIR)/usr%;\
s%@exec_prefix@%$(STAGING_DIR)/usr%;\
s%@libdir@%$(STAGING_DIR)/usr/lib%;\
s%@includedir@%$(STAGING_DIR)/usr/include%;\
s%@bindir@%$(STAGING_DIR)/usr/bin%;\
s%@PTHREAD_CFLAGS@%%;\
s%@PTHREAD_LIBS@%-lpthread%;' \
$(@D)/googletest/scripts/gtest-config.in \
> $(STAGING_DIR)/usr/bin/gtest-config
chmod +x $(STAGING_DIR)/usr/bin/gtest-config
endef
GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_GTEST_CONFIG
ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
GTEST_CONF_OPTS += -DBUILD_GMOCK=ON
# Generate the gmock-config script manually, since the CMake build system is
# not doing it.
define GTEST_INSTALL_GMOCK_CONFIG
sed 's%@PACKAGE_TARNAME@%gmock%;\
s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\
s%@prefix@%$(STAGING_DIR)/usr%;\
s%@exec_prefix@%$(STAGING_DIR)/usr%;\
s%@libdir@%$(STAGING_DIR)/usr/lib%;\
s%@includedir@%$(STAGING_DIR)/usr/include%;\
s%@bindir@%$(STAGING_DIR)/usr/bin%;\
s%@PTHREAD_CFLAGS@%%;\
s%@PTHREAD_LIBS@%-lpthread%;' \
$(@D)/googlemock/scripts/gmock-config.in \
> $(STAGING_DIR)/usr/bin/gmock-config
chmod +x $(STAGING_DIR)/usr/bin/gmock-config
endef
GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_INSTALL_GMOCK_CONFIG
else
GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
endif