[Pkg-ceph-commits] [ceph] 58/59: d/p/armhf-ftbfs.patch: Cherry pick upstream fix to resolve FTBFS on armhf.

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 508df5be8be37e54986db45d652acb4aefc2be86
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 3 09:46:16 2018 +0000

    d/p/armhf-ftbfs.patch: Cherry pick upstream fix to resolve FTBFS on armhf.
    
    (cherry picked from commit 75fe7caf40069f049c1f6bd9b319bf141f626a5d)
---
 debian/changelog                 |  2 ++
 debian/patches/armhf-ftbfs.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series            |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 171dcb1..b0fa7af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ceph (12.2.2-0ubuntu0.17.10.1) UNRELEASED; urgency=medium
 
   * New upstream stable release (LP: #1739002).
+    - d/p/armhf-ftbfs.patch: Cherry pick upstream fix to resolve
+      FTBFS on armhf.
 
  -- James Page <james.page at ubuntu.com>  Thu, 04 Jan 2018 09:13:07 +0000
 
diff --git a/debian/patches/armhf-ftbfs.patch b/debian/patches/armhf-ftbfs.patch
new file mode 100644
index 0000000..dc429ab
--- /dev/null
+++ b/debian/patches/armhf-ftbfs.patch
@@ -0,0 +1,32 @@
+From ce2e26d39ac6131cb3782446082ec2737a185517 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto at redhat.com>
+Date: Fri, 8 Dec 2017 00:21:38 +0100
+Subject: [PATCH] librbd: Do not instantiate TrimRequest template class
+
+We include TrimRequest.cc in librbd tests at two places:
+ - operation/test_mock_TrimRequest.cc
+ - operation/test_mock_ResizeRequest.cc
+
+That causes linking errors when doing the builds because some of the
+instantiated classes are defined twice.
+
+We can fix this by not instantiating the template class in the
+TrimReqeust.cc file when including it in the tests.
+
+Signed-off-by: Boris Ranto <branto at redhat.com>
+---
+ src/test/librbd/operation/test_mock_ResizeRequest.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc
+index e67f8a2a8321..7b70a50e8f48 100644
+--- a/src/test/librbd/operation/test_mock_ResizeRequest.cc
++++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc
+@@ -44,7 +44,6 @@ TrimRequest<MockImageCtx> *TrimRequest<MockImageCtx>::s_instance = nullptr;
+ 
+ // template definitions
+ #include "librbd/operation/ResizeRequest.cc"
+-#include "librbd/operation/TrimRequest.cc"
+ 
+ namespace librbd {
+ namespace operation {
diff --git a/debian/patches/series b/debian/patches/series
index 76f80f3..c840892 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@
 0003-Core-local-statistics.patch
 # Ubuntu: rocksdb/i386/gcc-7 compat
 rocksdb-fallthrough-i386.patch
+# Ubuntu: FTBFS on armhf
+armhf-ftbfs.patch

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