From e577eb1675abcafe7f3424c2de0a4746bbf76654 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Apr 11 2022 14:21:11 +0000 Subject: ceph-17.1.0-175-g086c8f84 --- diff --git a/.ceph.metadata b/.ceph.metadata index bcf77bd..f73de2f 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -9724d3d1857e95b2df6053240b224b14c171733c SOURCES/ceph-17.1.0-123-g14f44feb.tar.bz2 +800ebe357068e00d7f4e2e4354a1cff00ec2be3f SOURCES/ceph-17.1.0-175-g086c8f84.tar.bz2 diff --git a/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch new file mode 100644 index 0000000..1b16567 --- /dev/null +++ b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch @@ -0,0 +1,11 @@ +--- ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake.orig 2022-04-08 11:27:53.593570634 -0400 ++++ ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake 2022-04-08 11:28:20.778087653 -0400 +@@ -1991,7 +1991,7 @@ + + if((NOT ARROW_SIMD_LEVEL STREQUAL "NONE") OR (NOT ARROW_RUNTIME_SIMD_LEVEL STREQUAL "NONE" + )) +- set(xsimd_SOURCE "BUNDLED") ++ set(xsimd_SOURCE "SYSTEM") + resolve_dependency(xsimd) + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${XSIMD_INCLUDE_DIR}) diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 8c0462b..304e0e4 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -103,6 +103,8 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif +%bcond_with system_arrow +%bcond_without system_utf8proc %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif @@ -153,7 +155,7 @@ ################################################################################# Name: ceph Version: 17.1.0 -Release: 0.8.123.g14f44feb%{?dist} +Release: 0.9.175.g086c8f84%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -170,7 +172,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ #Source0: ceph-17.1.0.tar.gz -Source0: ceph-17.1.0-123-g14f44feb.tar.bz2 +Source0: ceph-17.1.0-175-g086c8f84.tar.bz2 Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0003: 0003-src-common-bitstr.h.patch Patch0008: 0008-cmake-modules-Finduring.cmake.patch @@ -180,6 +182,7 @@ Patch0012: 0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch Patch0016: 0016-src-tracing-patch Patch0017: 0017-gcc-12-omnibus.patch Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch +Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -289,10 +292,11 @@ BuildRequires: socat %if 0%{with zbd} BuildRequires: libzbd-devel %endif +BuildRequires: thrift-devel >= 0.13.0 +BuildRequires: re2-devel %if 0%{with jaeger} BuildRequires: bison BuildRequires: flex -BuildRequires: thrift-devel >= 0.13.0 %if 0%{?fedora} || 0%{?rhel} BuildRequires: json-devel %endif @@ -305,6 +309,15 @@ BuildRequires: libevent-devel BuildRequires: libpmem-devel BuildRequires: libpmemobj-devel %endif +%if 0%{with system_arrow} +BuildRequires: libarrow-devel +BuildRequires: parquet-libs-devel +%else +BuildRequires: xsimd-devel +%endif +%if 0%{with system_utf8proc} +BuildRequires: utf8proc-devel +%endif %if 0%{with seastar} BuildRequires: c-ares-devel BuildRequires: gnutls-devel @@ -1254,7 +1267,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-17.1.0-123-g14f44feb +%autosetup -p1 -n ceph-17.1.0-175-g086c8f84 %build # Disable lto on systems that do not support symver attribute @@ -1287,6 +1300,9 @@ export LDFLAGS="$RPM_LD_FLAGS" %if 0%{with seastar} # seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk() export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') +# remove from CFLAGS too because it causes the arrow submodule to fail with: +# warning _FORTIFY_SOURCE requires compiling with optimization (-O) +export CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') %endif env | sort @@ -1387,11 +1403,18 @@ mkdir -p %{_vpath_builddir} %if 0%{?rhel} -DWITH_FMT_HEADER_ONLY:BOOL=ON \ %endif +%if 0%{with system_arrow} + -DWITH_SYSTEM_ARROW:BOOL=ON \ +%endif +%if 0%{with system_utf8proc} + -DWITH_SYSTEM_UTF8PROC:BOOL=ON \ +%endif -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 @@ -2562,6 +2585,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Apr 8 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.9.175.g086c8f84 +- 17.1.0 snapshot 175 + * Tue Apr 5 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.8.123.g14f44feb - 17.1.0 snapshot 123 again