diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-12-19 23:12:43 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-12-29 10:15:05 +0900 |
| commit | 6b371df5d4dee4b357b839f7fb6eb75a420777ec (patch) | |
| tree | 9b42863b056638d26869febcaba1c449114b97ce /gnu/packages/patches/ceph-disable-cpu-optimizations.patch | |
| parent | d564b1c534b42e08d888594880d60f8fa88be64b (diff) | |
gnu: ceph: Update to 20.3.0 and reinstate parallel build.
* 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
Diffstat (limited to 'gnu/packages/patches/ceph-disable-cpu-optimizations.patch')
| -rw-r--r-- | gnu/packages/patches/ceph-disable-cpu-optimizations.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch deleted file mode 100644 index 421b1d4fe18..00000000000 --- a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable CPU optimizations not supported by all x86_64 systems. - ---- a/cmake/modules/SIMDExt.cmake 2017-03-23 22:22:58.254071694 +0100 -+++ b/cmake/modules/SIMDExt.cmake 2017-03-23 22:23:22.446848845 +0100 -@@ -5,11 +5,6 @@ - # HAVE_ARM_NEON - # HAVE_INTEL_SSE - # HAVE_INTEL_SSE2 --# HAVE_INTEL_SSE3 --# HAVE_INTEL_SSSE3 --# HAVE_INTEL_PCLMUL --# HAVE_INTEL_SSE4_1 --# HAVE_INTEL_SSE4_2 - # - # SIMD_COMPILE_FLAGS - # -@@ -85,26 +80,6 @@ - if(HAVE_INTEL_SSE2) - set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2") - endif() -- CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3) -- if(HAVE_INTEL_SSE3) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") -- endif() -- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3) -- if(HAVE_INTEL_SSSE3) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") -- endif() -- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL) -- if(HAVE_INTEL_PCLMUL) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") -- endif() -- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) -- if(HAVE_INTEL_SSE4_1) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") -- endif() -- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2) -- if(HAVE_INTEL_SSE4_2) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") -- endif() - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le") |