diff --git a/SOURCES/abseil-cpp-20210324-gtest.patch b/SOURCES/abseil-cpp-20210324-gtest.patch new file mode 100644 index 0000000..a43b5ca --- /dev/null +++ b/SOURCES/abseil-cpp-20210324-gtest.patch @@ -0,0 +1,26 @@ +diff -up ./CMakeLists.txt.2 ./CMakeLists.txt +--- ./CMakeLists.txt.2 2021-04-20 12:55:14.000000000 -0400 ++++ ./CMakeLists.txt 2021-05-21 22:26:12.910191071 -0400 +@@ -127,6 +127,22 @@ if(BUILD_TESTING) + set(absl_gtest_src_dir ${ABSL_LOCAL_GOOGLETEST_DIR}) + endif() + include(CMake/Googletest/DownloadGTest.cmake) ++ else() ++ # Set up gtest targets ++ find_library(GTEST_LIB gtest) ++ add_library(gtest UNKNOWN IMPORTED) ++ set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_LIB}) ++ find_library(GTEST_MAIN_LIB gtest_main) ++ add_library(gtest_main UNKNOWN IMPORTED) ++ set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION ${GTEST_MAIN_LIB} INTERFACE_LINK_LIBRARIES gtest) ++ ++ # Set up gmock targets ++ find_library(GMOCK_LIB gmock) ++ add_library(gmock UNKNOWN IMPORTED) ++ set_target_properties(gmock PROPERTIES IMPORTED_LOCATION ${GMOCK_LIB} INTERFACE_LINK_LIBRARIES gtest) ++ find_library(GMOCK_MAIN_LIB gmock_main) ++ add_library(gmock_main UNKNOWN IMPORTED) ++ set_target_properties(gmock_main PROPERTIES IMPORTED_LOCATION ${GMOCK_MAIN_LIB} INTERFACE_LINK_LIBRARIES "gmock;Threads::Threads") + endif() + + check_target(gtest) diff --git a/SOURCES/abseil-cpp-20210324.2-armv7.patch b/SOURCES/abseil-cpp-20210324.2-armv7.patch new file mode 100644 index 0000000..9a5eaec --- /dev/null +++ b/SOURCES/abseil-cpp-20210324.2-armv7.patch @@ -0,0 +1,19 @@ +diff -up ./absl/base/internal/sysinfo_test.cc.armv7 ./absl/base/internal/sysinfo_test.cc +--- ./absl/base/internal/sysinfo_test.cc.armv7 2021-06-09 21:54:44.503755718 -0400 ++++ ./absl/base/internal/sysinfo_test.cc 2021-06-09 22:56:14.459611843 -0400 +@@ -43,13 +43,13 @@ TEST(SysinfoTest, NumCPUs) { + // POWER is particularly problematic here; some Linux kernels expose the CPU + // frequency, while others do not. Since we can't predict a priori what a given + // machine is going to do, just disable this test on POWER on Linux. +-#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__))) ++#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) || defined(__arm__))) + TEST(SysinfoTest, NominalCPUFrequency) { + // Linux only exposes the CPU frequency on certain architectures, and + // Emscripten doesn't expose it at all. + #if defined(__linux__) && \ + (defined(__aarch64__) || defined(__hppa__) || defined(__mips__) || \ +- defined(__riscv) || defined(__s390x__)) || \ ++ defined(__riscv) || defined(__s390x__)) || \ + defined(__EMSCRIPTEN__) + EXPECT_EQ(NominalCPUFrequency(), 1.0) + << "CPU frequency detection was fixed! Please update unittest.";