From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Sep 2017 02:30:16 +0000 (+0800)
Subject: cmake: do not pass $SIMD_COMPILE_FLAGS to rocksdb cmake
X-Git-Tag: v12.2.1~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17745%2Fhead;p=ceph.git

cmake: do not pass $SIMD_COMPILE_FLAGS to rocksdb cmake

which enables SSE42 globally in rocksdb. and we will end up with a
binary not portable on non-SSE42 enabled machines.

Fixes: http://tracker.ceph.com/issues/20529
Signed-off-by: Kefu Chai <kchai@redhat.com>

Conflicts:
	this change is not cherry-picked from master. because the
PR targeting master (https://github.com/ceph/ceph/pull/17388) is
still pending on review. and the cmake changes is different if
we want to use a recent commit of rocksdb, as it's doing differently
in cmake to address the portability issues.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 915e10aa6649..3cdcb95be4b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -811,13 +811,8 @@ if (NOT WITH_SYSTEM_ROCKSDB)
     list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
   endif(WITH_CCACHE AND CCACHE_FOUND)
 
-  # We really want to have the CRC32 calculation in RocksDB accelerated
-  # with SSE 4.2. For details refer to rocksdb/util/crc32c.cc.
-  if (HAVE_INTEL_SSE4_2)
-    list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${SIMD_COMPILE_FLAGS})
-  else()
-    list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_SSE42=OFF)
-  endif()
+  # SSE 4.2 is enabled by default in rocksdb's crc32c. For details refer to
+  # rocksdb/util/crc32c.cc.
   list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
   list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})