[Pkg-ceph-commits] [ceph] 07/09: Remove patch fix-build-without-libatomic-ops applied upstream

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to tag debian/0.80.11-1
in repository ceph.

commit 88a4ee8db0a4b9940bee91d16e399da266c85ff0
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Thu Jan 14 22:15:11 2016 +0100

    Remove patch fix-build-without-libatomic-ops applied upstream
---
 .../patches/fix-build-without-libatomic-ops.patch  | 32 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 33 deletions(-)

diff --git a/debian/patches/fix-build-without-libatomic-ops.patch b/debian/patches/fix-build-without-libatomic-ops.patch
deleted file mode 100644
index 265639f..0000000
--- a/debian/patches/fix-build-without-libatomic-ops.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2e09a2c22ab885f8ec81dbc55f2c8fc0f2984543
-Author: Sage Weil <sage at redhat.com>
-Date:   Wed Sep 23 17:06:52 2015 -0400
-
-    common/RWLock: include assert
-    
-    Fixes atomic_t build issue without libatomic-ops.
-    
-    Fixes: #13088
-    Signed-off-by: Sage Weil <sage at redhat.com>
-
-diff --git a/src/common/RWLock.h b/src/common/RWLock.h
-index 1a70ef1..308092c 100644
---- a/src/common/RWLock.h
-+++ b/src/common/RWLock.h
-@@ -19,6 +19,7 @@
- 
- #include <pthread.h>
- #include "lockdep.h"
-+#include "include/assert.h"
- #include "include/atomic.h"
- 
- class RWLock
-@@ -26,7 +27,7 @@ class RWLock
-   mutable pthread_rwlock_t L;
-   const char *name;
-   mutable int id;
--  mutable atomic_t nrlock, nwlock;
-+  mutable ceph::atomic_t nrlock, nwlock;
- 
- public:
-   RWLock(const RWLock& other);
diff --git a/debian/patches/series b/debian/patches/series
index e081369..382b92d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@ bash-completion.patch
 rbdmap1-mount.patch
 rbdmap2-hooks.patch
 boost-1.57_1.patch
-fix-build-without-libatomic-ops.patch
 
 ## Debian
 rbdmap3-lazyumount.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git