cmake,debian,rpm: remove atomic_t completely

Signed-off-by: Kefu Chai <[email protected]>
byss · Jun 8, 2017 · a87fa37 · a87fa37
1 parent e702564
commit a87fa37
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 198 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -250,12 +250,6 @@ if(WITH_LEVELDB)
   find_file(HAVE_LEVELDB_FILTER_POLICY leveldb/filter_policy.h PATHS ${LEVELDB_INCLUDE_DIR})
 endif(WITH_LEVELDB)
 
-find_package(atomic_ops REQUIRED)
-message(STATUS "${ATOMIC_OPS_LIBRARIES}")
-if(NOT ${ATOMIC_OPS_FOUND})
-  set(NO_ATOMIC_OPS 1)
-endif(NOT ${ATOMIC_OPS_FOUND})
-
 find_package(snappy REQUIRED)
 
 option(WITH_LZ4 "LZ4 compression support" OFF)

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
@@ -38,7 +38,6 @@ makedepends="
 	keyutils-dev
 	leveldb-dev
 	libaio-dev
-	libatomic_ops-dev
 	libedit-dev
 	libressl-dev
 	libtirpc-dev

diff --git a/ceph.spec.in b/ceph.spec.in
@@ -115,7 +115,6 @@ BuildRequires:	gperftools-devel >= 2.4
 BuildRequires:  jq
 BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
-BuildRequires:	libatomic_ops-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libcurl-devel
 BuildRequires:	libudev-devel

diff --git a/cmake/modules/Findatomic_ops.cmake b/cmake/modules/Findatomic_ops.cmake
diff --git a/debian/control b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: bc,
 	       jq,
                junit4,
                libaio-dev,
-               libatomic-ops-dev,
                libbabeltrace-ctf-dev,
                libbabeltrace-dev,
                libblkid-dev (>= 2.17),

diff --git a/install-deps.sh b/install-deps.sh
@@ -30,7 +30,6 @@ if [ x`uname`x = xFreeBSDx ]; then
         devel/boost-python-libs \
         devel/valgrind \
         devel/pkgconf \
-        devel/libatomic_ops \
         devel/libedit \
         devel/libtool \
         devel/google-perftools \

diff --git a/src/include/atomic.h b/src/include/atomic.h
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
@@ -84,9 +84,6 @@
 /* Define if you have res_nquery */
 #cmakedefine HAVE_RES_NQUERY
 
-/* Defined if you don't have atomic_ops */
-#cmakedefine NO_ATOMIC_OPS
-
 /* Defined if you have LZ4 */
 #cmakedefine HAVE_LZ4