cmake,deb: remove the last trace of atomic_ops

Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph · Nov 3, 2017 · c8d4005 · c8d4005
1 parent c43bac4
commit c8d4005
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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()