From fce6d7360e1c3bc01f8f34fe4add04a2226cf55b Mon Sep 17 00:00:00 2001 From: Aibek Bukabayev Date: Thu, 21 Dec 2023 11:27:46 +0600 Subject: [PATCH] PXB-3210: PXB fails to build on macOS since 8.0.33-28 due to FIND_PROCPS() https://jira.percona.com/browse/PXB-3210 When predicting required memory for prepare (PXB-2710) `sys/sysctl` is used by macOS and `proc/sysinfo` by other systems for memory calculation. As part of the PXB-2993 fix to make the memory calculation logic compatible with procps-4 procps.cmake file was introduced to detect the version during cmake, but cmake macro is not accounting for macOS and and failing to find procps on macOS. Now we make sure that cmake does not search for procps on macOS. --- storage/innobase/xtrabackup/src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/storage/innobase/xtrabackup/src/CMakeLists.txt b/storage/innobase/xtrabackup/src/CMakeLists.txt index 68e33365a36b..801c760fc215 100644 --- a/storage/innobase/xtrabackup/src/CMakeLists.txt +++ b/storage/innobase/xtrabackup/src/CMakeLists.txt @@ -21,7 +21,10 @@ OPTION(WITH_VERSION_CHECK "Build with version check" ON) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) FIND_GCRYPT() -FIND_PROCPS() + +IF(NOT APPLE) + FIND_PROCPS() +ENDIF() CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)