diff --git a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch new file mode 100644 index 0000000000..814912650b --- /dev/null +++ b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch @@ -0,0 +1,26 @@ +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 + +--- ./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()) ++#if GTEST_INTERNAL_HAS_INCLUDE() || \ ++ (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include)) + #include // C++20 and later +-#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE()) +-#include // Pre-C++20 ++#else ++#include // Pre-C++20 + #endif + + #include // for isspace, etc diff --git a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb b/meta-oe/recipes-test/googletest/googletest_1.16.0.bb index cc2e8e3c94..fe2f732a5d 100644 --- a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.16.0.bb @@ -8,7 +8,9 @@ PROVIDES += "gmock gtest" S = "${WORKDIR}/git" SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5" -SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https" +SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \ + file://gtest-ciso646.patch \ +" inherit cmake pkgconfig