mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 20:15:25 -06:00
6b371df5d4
* gnu/packages/storage.scm (ceph): Update to 20.3.0.
[source]: Switch to git.
<patches>: Remove ceph-disable-cpu-optimizations.patch and
ceph-fix-for-newer-boost.patch patches, which no longer apply. Add
ceph-fix-cmake.patch.
<snippet>: Update snippet.
[outputs]: Delete field.
[#:parallel-build?]: Delete argument.
[#:configure-flags]: Streamline, due to removing the lib separate output. Add
"-DENABLE_GIT_VERSION=OFF", "-DCEPHADM_BUNDLED_DEPENDENCIES=none",
"-DWITH_SYSTEM_FMT=ON", "-DWITH_SYSTEM_LIBURING=ON", "-DWITH_SYSTEM_ZSTD=ON",
"-DWITH_MGR=OFF" and "-DWITH_RADOSGW=OFF".
[target-x86-64?]: Add "-DWITH_SYSTEM_QATLIB=ON" and "-DWITH_SYSTEM_QATZIP=ON".
[#:phases] {unbundle-blake3, relax-fmt-requirement, fix-zstd-include}
{set-source-file-times-to-1980, build-legacy-option-header}: New phases.
{set-install-environment}: Delete phase.
{patch-source}: Streamline and update phase.
[native-inputs]: Remove gperf, git-minimal.
[inputs]: Sort. Replace boost with boost-1.88. Replace fmt-8 with fmt-11.
Replace rocksdb with rocksdb-for-ceph.
Replace fuse-2 by fuse. Add libcap, libnbd, liburing, lmdb and zstd:lib.
<[target-x86-64?]>: Add qatlib and qatzip.
* gnu/packages/patches/ceph-fix-cmake.patch: New file.
* gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Delete file.
* gnu/packages/patches/ceph-fix-for-newer-boost.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Fixes: #1918
Change-Id: Ifd7af71bd87c19c8c6b96349e06c365be976347a
22 lines
737 B
Diff
22 lines
737 B
Diff
Upstream-status: Not forwarded yet.
|
|
|
|
diff -u /tmp/guix-build-ceph-20.3.0.drv-0/source/CMakeLists.txt /tmp/guix-build-ceph-20.3.0.drv-0/source/CMakeLists.txt.orig
|
|
--- a/CMakeLists.txt 2025-12-19 13:14:44.050684729 +0900
|
|
+++ b/CMakeLists.txt 2025-12-19 13:15:06.218810041 +0900
|
|
@@ -356,12 +356,12 @@
|
|
find_package(QatDrv REQUIRED COMPONENTS qat_s usdm_drv_s)
|
|
set(HAVE_QAT TRUE)
|
|
elseif(WITH_QATLIB)
|
|
- if(NOT WITH_SYSTEM_QAT)
|
|
+ if(NOT WITH_SYSTEM_QATLIB)
|
|
include(BuildQAT)
|
|
build_qat()
|
|
endif()
|
|
find_package(QAT REQUIRED)
|
|
- if(NOT WITH_SYSTEM_QAT)
|
|
+ if(NOT WITH_SYSTEM_QATLIB)
|
|
add_dependencies(QAT::qat qatlib_ext)
|
|
add_dependencies(QAT::usdm qatlib_ext)
|
|
endif()
|
|
|
|
Diff finished. Fri Dec 19 13:15:39 2025
|