rpms/ceph
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).

Browse Source
This commit is contained in:
Richard W.M. Jones 2015-07-31 14:56:49 +01:00
parent bb85c64a3d
commit 222abd2152
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-mon-remove-unused-variable.patch Normal file
View File

@ -0,0 +1,30 @@
From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 8 May 2015 15:21:20 +0800
Subject: [PATCH] mon: remove unused variable
* as a side effect, this change silences
http://tracker.ceph.com/issues/11576
Fixes: #11576
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
src/mon/OSDMonitor.cc | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 73dcd5f..7caaa45 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
} else if (prefix == "osd crush get-tunable") {
string tunable;
cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
- int value;
- cmd_getval(g_ceph_context, cmdmap, "value", value);
ostringstream rss;
if (f)
f->open_object_section("tunable");
--
2.5.0

9
ceph.spec
View File

@ -12,7 +12,7 @@
#################################################################################
Name: ceph
Version: 0.94.2
Release: 3%{?dist}
Release: 4%{?dist}
Epoch: 1
Summary: User space components of the Ceph file system
License: GPLv2
@ -27,6 +27,9 @@ Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
# fix build without tcmalloc
# https://github.com/ceph/rocksdb/pull/5
Patch10: ceph-0.94.1-tcmalloc.patch
# Fixes builds against boost 1.58.
# Upstream commit e7b196a4a091c0ea258866559ba06e7ed0cc4247
Patch11: 0001-mon-remove-unused-variable.patch
Requires: librbd1 = %{epoch}:%{version}-%{release}
Requires: librados2 = %{epoch}:%{version}-%{release}
Requires: libcephfs1 = %{epoch}:%{version}-%{release}
@ -432,6 +435,7 @@ python-cephfs instead.
%patch1 -p1
%patch3 -p1
%patch10 -p1 -b .tcmalloc
%patch11 -p1 -b .boost
%build
# Find jni.h
@ -934,6 +938,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
# actually build this meta package.
%changelog
* Fri Jul 31 2015 Richard W.M. Jones <rjones@redhat.com> - 1:0.94.2-4
- Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.2-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159