diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-12-27 21:40:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-28 16:35:37 +0200 |
| commit | dcfe44cbce97e887d033b6adefd7669f47c36e4f (patch) | |
| tree | 6d10bdf0e0af66c7e28b80e60eef62136457ea31 /gnu/packages/patches/ceph-disable-cpu-optimizations.patch | |
| parent | 22ea02351f4fed0789d7d1c379690c1b08039fe8 (diff) | |
| download | guix-patches-dcfe44cbce97e887d033b6adefd7669f47c36e4f.tar guix-patches-dcfe44cbce97e887d033b6adefd7669f47c36e4f.tar.gz | |
gnu: Add ceph.
* gnu/packages/storage.scm,
gnu/packages/patches/ceph-disable-cpu-optimizations.patch,
gnu/packages/patches/ceph-skip-collect-sys-info-test.patch,
gnu/packages/patches/ceph-skip-unittest_blockdev.patch: New files.
* gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches/ceph-disable-cpu-optimizations.patch')
| -rw-r--r-- | gnu/packages/patches/ceph-disable-cpu-optimizations.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch new file mode 100644 index 0000000000..f4d258b602 --- /dev/null +++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch @@ -0,0 +1,46 @@ +Disable CPU optimizations not supported by the vast majority of +x86_64 systems. Also don't add anything for i686. + +--- 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 +@@ -6,10 +6,6 @@ + # 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 + # +@@ -41,7 +37,7 @@ + if(HAVE_ARM_NEON) + set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon") + endif() +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") + set(HAVE_INTEL 1) + CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) + if(HAVE_INTEL_SSE) +@@ -55,20 +51,4 @@ + 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() |