diff options
| -rw-r--r-- | meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-test/googletest/googletest_1.17.0.bb (renamed from meta-oe/recipes-test/googletest/googletest_1.16.0.bb) | 7 |
2 files changed, 3 insertions, 30 deletions
diff --git a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch deleted file mode 100644 index 814912650b..0000000000 --- a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | https://github.com/google/googletest/issues/4701 | ||
| 2 | |||
| 3 | taken from fedora: | ||
| 4 | https://src.fedoraproject.org/rpms/gtest/c/b3fe6f803a1e554971f70e1c3f55aa5fcb377b1b?branch=rawhide | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 8 | |||
| 9 | --- ./googletest/include/gtest/internal/gtest-port.h.orig 2025-01-27 03:39:18.963893931 +0000 | ||
| 10 | +++ ./googletest/include/gtest/internal/gtest-port.h 2025-01-28 13:57:51.381081952 +0000 | ||
| 11 | @@ -288,11 +288,11 @@ | ||
| 12 | |||
| 13 | // Detect C++ feature test macros as gracefully as possible. | ||
| 14 | // MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros. | ||
| 15 | -#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \ | ||
| 16 | - (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>)) | ||
| 17 | +#if GTEST_INTERNAL_HAS_INCLUDE(<version>) || \ | ||
| 18 | + (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include)) | ||
| 19 | #include <version> // C++20 and later | ||
| 20 | -#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>)) | ||
| 21 | -#include <ciso646> // Pre-C++20 | ||
| 22 | +#else | ||
| 23 | +#include <cerrno> // Pre-C++20 | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <ctype.h> // for isspace, etc | ||
diff --git a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb index 55d670a428..c8ed80053d 100644 --- a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb | |||
| @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" | |||
| 6 | 6 | ||
| 7 | PROVIDES += "gmock gtest" | 7 | PROVIDES += "gmock gtest" |
| 8 | 8 | ||
| 9 | SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5" | 9 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \ |
| 10 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \ | 10 | " |
| 11 | file://gtest-ciso646.patch \ | 11 | SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723" |
| 12 | " | ||
| 13 | 12 | ||
| 14 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
| 15 | 14 | ||
