[Pkg-ceph-commits] [ceph] 01/03: Add upstream patch to fix building without libatomic-ops

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch master
in repository ceph.

commit 2d14828a0914964316c9977f3f60418496fe6a2b
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Mon Oct 12 16:25:21 2015 +0200

    Add upstream patch to fix building without libatomic-ops
    
    Closes: #801477
---
 .../patches/fix-build-without-libatomic-ops.patch  | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/fix-build-without-libatomic-ops.patch b/debian/patches/fix-build-without-libatomic-ops.patch
new file mode 100644
index 0000000..265639f
--- /dev/null
+++ b/debian/patches/fix-build-without-libatomic-ops.patch
@@ -0,0 +1,32 @@
+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 d6dc7ff..200b8e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@ CVE-2015-5245.patch
 boost-1.57_1.patch
 boost-1.57_2.patch
 boost-1.58.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