From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Oct 2017 17:50:44 +0000 (+0800)
Subject: cmake,deb: remove the last trace of atomic_ops
X-Git-Tag: v13.0.1~290^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c8d4005558512b7f92c2ef4409dc4e1ace3a2508;p=ceph-ci.git

cmake,deb: remove the last trace of atomic_ops

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/debian/rules b/debian/rules
index 731cf1fb79d..fec3b47c888 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   extraopts += -DBOOST_J=$(NUMJOBS)
 endif
 
-ifeq ($(DEB_HOST_ARCH), armel)
-  # armel supports ARMv4t or above instructions sets.
-  # libatomic-ops is only usable with Ceph for ARMv6 or above.
-  extraopts += -DWITH_ATOMIC_OPS=OFF
-endif
-
 ifneq (,$(filter $(DEB_HOST_ARCH), arm armel armhf arm64 i386 amd64 mips mipsel powerpc ppc64))
   # beast depends on libboost_context which only support the archs above
   extraopts += -DWITH_RADOSGW_BEAST_FRONTEND=ON
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb2f558d021..cd41f0dc347 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -178,7 +178,7 @@ if(COMPILER_SUPPORTS_DIAGNOSTICS_COLOR)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=${DIAGNOSTICS_COLOR}")
 endif()
 
-set(EXTRALIBS ${CMAKE_DL_LIBS} ${ATOMIC_OPS_LIBRARIES})
+set(EXTRALIBS ${CMAKE_DL_LIBS})
 if(NOT APPLE)
   list(APPEND EXTRALIBS rt)
 endif()