diff --git a/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest/googletest-gcc-11.patch b/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest/googletest-gcc-11.patch new file mode 100644 index 0000000000000000000000000000000000000000..ed13bcb8f32891a211f53ac629f6e20f04d7fc28 --- /dev/null +++ b/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest/googletest-gcc-11.patch @@ -0,0 +1,13 @@ +diff -up git/googletest/include/gtest/hwext/gtest-tag.h.omv~ git/googletest/include/gtest/hwext/gtest-tag.h +--- git/googletest/include/gtest/hwext/gtest-tag.h.omv~ 2021-07-06 19:01:12.828013607 +0200 ++++ git/googletest/include/gtest/hwext/gtest-tag.h 2021-07-06 19:01:24.291492486 +0200 +@@ -3,7 +3,8 @@ + #ifndef GTEST_INCLUDE_GTEST_GTEST_TAG_H_ + #define GTEST_INCLUDE_GTEST_GTEST_TAG_H_ + +-#include <string.h> ++#include <string> ++#include <cstring> + #include <map> + #include <vector> + diff --git a/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest_git.bb b/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest_git.bb index 05fa6b6b0159f151b2db10f5aaece36cf2efed7a..b89dce976d9403dfd0dd998e1719a43e4abb5059 100644 --- a/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest_git.bb +++ b/meta-ohos-acts/recipes-ohos-googletest/ohos-googletest/ohos-googletest_git.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ file://googlemock/scripts/generator/LICENSE;md5=2c0b90db7465231447cf2dd2e8163333 \ file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/third_party_googletest.git;protocol=https;branch=ostc-next" +SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/third_party_googletest.git;protocol=https;branch=ostc-next \ +file://googletest-gcc-11.patch" SRCREV = "54337710388898ae818bbc2c0e0457c9b86e335e" S = "${WORKDIR}/git" PV = "0.0+git${SRCPV}"