diff --git a/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch index d2f6024..1b16567 100644 --- a/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch +++ b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch @@ -9,14 +9,3 @@ resolve_dependency(xsimd) # TODO: Don't use global includes but rather target_include_directories include_directories(SYSTEM ${XSIMD_INCLUDE_DIR}) ---- ceph-17.1.0-175-g086c8f84/cmake/modules/FindArrow.cmake.orig 2022-04-08 18:36:33.964723501 -0400 -+++ ceph-17.1.0-175-g086c8f84/cmake/modules/FindArrow.cmake 2022-04-08 18:36:50.175437463 -0400 -@@ -393,7 +393,7 @@ - "${ARROW_HOME}" - arrow - arrow/api.h -- Arrow -+ arrow - arrow) - - if(ARROW_HOME) diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 53ca206..2d054a9 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -101,7 +101,7 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif -%bcond_without system_arrow +%bcond_with system_arrow %bcond_without system_utf8proc %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 @@ -1411,8 +1411,9 @@ mkdir -p %{_vpath_builddir} -DWITH_GRAFANA:BOOL=ON %if %{with cmake_verbose_logging} -cat ./CMakeFiles/CMakeOutput.log -cat ./CMakeFiles/CMakeError.log +#cat ./%{_vpath_builddir}/CMakeFiles/CMakeOutput.log +#cat ./%{_vpath_builddir}/CMakeFiles/CMakeError.log +#cd %{_vpath_builddir} && cmake -LA %endif export VERBOSE=1