edencommon: add patch for glog ≥ 0.7.0

This commit is contained in:
Emily 2025-01-06 23:22:22 +00:00
parent 40bc7c2bd5
commit 05f5a382f7
2 changed files with 35 additions and 4 deletions

View File

@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d7b3454df..2ce7b5af1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,7 @@
"${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake"
${CMAKE_MODULE_PATH})
-find_package(Glog MODULE REQUIRED)
-include_directories(${GLOG_INCLUDE_DIR})
+find_package(Glog CONFIG REQUIRED)
find_package(Gflags REQUIRED)
include_directories(${GFLAGS_INCLUDE_DIR})
diff --git a/eden/common/testharness/CMakeLists.txt b/eden/common/testharness/CMakeLists.txt
index bef7421906..f35067efa9 100644
--- a/eden/common/testharness/CMakeLists.txt
+++ b/eden/common/testharness/CMakeLists.txt
@@ -19,7 +19,7 @@
${BOOST_LIBRARIES}
Folly::folly_test_util
${LIBGMOCK_LIBRARIES}
- ${GLOG_LIBRARY}
+ glog::glog
)
target_include_directories(

View File

@ -35,10 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag=";
};
patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
# Test discovery timeout is bizarrely flaky on `x86_64-darwin`
./increase-test-discovery-timeout.patch
];
patches =
[
./glog-0.7.patch
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
# Test discovery timeout is bizarrely flaky on `x86_64-darwin`
./increase-test-discovery-timeout.patch
];
nativeBuildInputs = [
cmake