[packages/ceph/DEVEL-17] - added system-xsimd patch from Fedora; updated some dependencies
qboosh
qboosh at pld-linux.org
Fri Sep 16 21:27:33 CEST 2022
commit 674529cbb4ceb6f28026e60cd00e65f96ea80cad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 16 21:27:51 2022 +0200
- added system-xsimd patch from Fedora; updated some dependencies
ceph-system-xsimd.patch | 11 +++++++++++
ceph.spec | 14 +++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index e94231a..5d4eff1 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,7 +1,6 @@
# TODO:
-# - QATZIP? (WITH_QATZIP=ON, BR: QATzip-devel)
+# - system arrow, parquet (WITH_SYSTEM_ARROW=ON, arrow>=4, parquet>=4)?
# - brotli? (WITH_BROTLI=ON, uses internal brotli as downloaded subproject)
-# - seastar (WITH_SEASTAR=ON, BR: c-ares-devel >= 1.13.0)
# - proper init scripts if non-systemd boot is to be supported
# (upstream scripts seem overcomplicated and hardly useful)
# - run as non-root user
@@ -73,11 +72,13 @@ Patch13: %{name}-libfmt.patch
Patch14: %{name}-system-rocksdb.patch
# https://src.fedoraproject.org/rpms/ceph/blob/rawhide/f/0017-gcc-12-omnibus.patch
Patch15: %{name}-gcc12.patch
+# https://src.fedoraproject.org/rpms/ceph/blob/rawhide/f/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch
+Patch16: %{name}-system-xsimd.patch
URL: https://ceph.io/
%{?with_qatzip:BuildRequires: QATzip-devel}
%{?with_babeltrace:BuildRequires: babeltrace-devel}
-BuildRequires: boost-devel >= 1.72
-BuildRequires: boost-python3-devel >= 1.72
+BuildRequires: boost-devel >= 1.73
+BuildRequires: boost-python3-devel >= 1.73
%{?with_seastar:BuildRequires: c-ares-devel >= 1.13.0}
BuildRequires: cmake >= 3.22.2
%{?with_seastar:BuildRequires: cryptopp-devel >= 5.6.5}
@@ -121,6 +122,7 @@ BuildRequires: libstdc++-devel >= 6:7
%{?with_tcmalloc:BuildRequires: libtcmalloc-devel >= 2.6.2}
BuildRequires: libtool >= 2:1.5
BuildRequires: liburing-devel
+BuildRequires: libutf8proc-devel >= 2.2.0
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.0
%{?with_zbd:BuildRequires: libzbd-devel}
@@ -157,6 +159,7 @@ BuildRequires: thrift-devel
BuildRequires: udev-devel
%{?with_dpdk:BuildRequires: xorg-lib-libpciaccess-devel}
BuildRequires: xfsprogs-devel
+BuildRequires: xsimd-devel
%{?with_seastar:BuildRequires: yaml-cpp-devel >= 0.5.1}
%ifarch %{x8664}
BuildRequires: yasm
@@ -206,7 +209,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Cepha
License: LGPL v2.1
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: boost-devel >= 1.72
+Requires: boost-devel >= 1.73
Requires: curl-devel
Requires: expat-devel >= 1.95
Requires: fcgi-devel
@@ -344,6 +347,7 @@ uruchamiania demonów.
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
src/{ceph-post-file.in,rbd-replay-many,rbdmap} \
diff --git a/ceph-system-xsimd.patch b/ceph-system-xsimd.patch
new file mode 100644
index 0000000..1b16567
--- /dev/null
+++ b/ceph-system-xsimd.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})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/674529cbb4ceb6f28026e60cd00e65f96ea80cad
More information about the pld-cvs-commit
mailing list