From 68645d1e125afaa3efbd5419eaacaef4bae38e8c Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Mon, 25 Mar 2024 15:47:47 +0100 Subject: [PATCH] add missing patch --- .../ceph-disable-cpu-optimizations.patch | 43 +++++++++++++++++++ .../ceph-fix-snappy-breaking-change.patch | 13 ------ 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 glicid/packages/patches/ceph-disable-cpu-optimizations.patch delete mode 100644 glicid/packages/patches/ceph-fix-snappy-breaking-change.patch diff --git a/glicid/packages/patches/ceph-disable-cpu-optimizations.patch b/glicid/packages/patches/ceph-disable-cpu-optimizations.patch new file mode 100644 index 0000000..421b1d4 --- /dev/null +++ b/glicid/packages/patches/ceph-disable-cpu-optimizations.patch @@ -0,0 +1,43 @@ +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") diff --git a/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch b/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch deleted file mode 100644 index 7a10e2e..0000000 --- a/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch tracked upstream at https://tracker.ceph.com/issues/50934 - ---- a/src/compressor/snappy/SnappyCompressor.h -+++ b/src/compressor/snappy/SnappyCompressor.h -@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { - if (qat_enabled) - return qat_accel.decompress(p, compressed_len, dst); - #endif -- snappy::uint32 res_len = 0; -+ uint32_t res_len = 0; - BufferlistSource source_1(p, compressed_len); - if (!snappy::GetUncompressedLength(&source_1, &res_len)) { - return -1;