summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authoryangwei <[email protected]>2024-11-11 17:48:31 +0800
committeryangwei <[email protected]>2024-11-11 18:29:12 +0800
commite9d67637421ab46a90c137275e89ff492c7c70a3 (patch)
treee5d07bcfb4adb816cac37d3e62ef6a50a21db5c4 /vendor
parent357179dd15ed1ab0eea73099a1c506f9c85d7f40 (diff)
🐎 ci(add aarch64 jobs): aarch64 + el9v3.1.2develop-3.0
Diffstat (limited to 'vendor')
-rw-r--r--vendor/CMakeLists.txt1
-rw-r--r--vendor/gtest-death-test.cc.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index b754ac3..7c668b1 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -5,6 +5,7 @@ include(ExternalProject)
ExternalProject_Add(libgtest PREFIX libgtest
URL ${CMAKE_SOURCE_DIR}/vendor/googletest-release-1.10.0.tar.gz
URL_MD5 ecd1fa65e7de707cd5c00bdac56022cd
+ PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/gtest-death-test.cc.patch
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
ExternalProject_Get_Property(libgtest INSTALL_DIR)
file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
diff --git a/vendor/gtest-death-test.cc.patch b/vendor/gtest-death-test.cc.patch
new file mode 100644
index 0000000..476981a
--- /dev/null
+++ b/vendor/gtest-death-test.cc.patch
@@ -0,0 +1,11 @@
+--- a/googletest/src/gtest-death-test.cc.origin 2024-11-11 16:21:17.365946156 +0800
++++ b/googletest/src/gtest-death-test.cc 2024-11-11 16:21:31.656137890 +0800
+@@ -1296,7 +1296,7 @@
+ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+ GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+ static bool StackGrowsDown() {
+- int dummy;
++ int dummy=0;
+ bool result;
+ StackLowerThanAddress(&dummy, &result);
+ return result;