MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 22:35:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

googletest: upgrade 1.16.0 -> 1.17.0

Browse Source 
ChangeLog:
https://github.com/google/googletest/releases/tag/v1.17.0

Drop gtest-ciso646.patch as the issue has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2025-11-04 16:09:06 +08:00 committed by Khem Raj
parent 53eb50e4ce
commit 40445a7e32
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch
View File

@ -1,26 +0,0 @@
https://github.com/google/googletest/issues/4701
taken from fedora:
https://src.fedoraproject.org/rpms/gtest/c/b3fe6f803a1e554971f70e1c3f55aa5fcb377b1b?branch=rawhide
Upstream-Status: Pending
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
--- ./googletest/include/gtest/internal/gtest-port.h.orig 2025-01-27 03:39:18.963893931 +0000
+++ ./googletest/include/gtest/internal/gtest-port.h 2025-01-28 13:57:51.381081952 +0000
@@ -288,11 +288,11 @@
// Detect C++ feature test macros as gracefully as possible.
// MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros.
-#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \
- (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>))
+#if GTEST_INTERNAL_HAS_INCLUDE(<version>) || \
+ (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include))
#include <version> // C++20 and later
-#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>))
-#include <ciso646> // Pre-C++20
+#else
+#include <cerrno> // Pre-C++20
#endif
#include <ctype.h> // for isspace, etc

5
meta-oe/recipes-test/googletest/googletest_1.16.0.bb → meta-oe/recipes-test/googletest/googletest_1.17.0.bb
View File

@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
PROVIDES += "gmock gtest" PROVIDES += "gmock gtest"
SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5" SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \
SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \
file://gtest-ciso646.patch \
" "
SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723"
inherit cmake pkgconfig inherit cmake pkgconfig