[Pkg-ceph-commits] [ceph] 01/01: patch to fix FTBFS on alpha (Closes: #756892)

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository ceph.

commit 431dd74 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Aug 23 17:55:41 2014

    patch to fix FTBFS on alpha (Closes: #756892)
    
     Thanks, Michael Cree.
---
 debian/patches/fix-blkdev-BLKGETSIZE-check.patch | 35 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/fix-blkdev-BLKGETSIZE-check.patch b/debian/patches/fix-blkdev-BLKGETSIZE-check.patch
new file mode 100644
index 0000000..bef37bb
--- /dev/null
+++ b/debian/patches/fix-blkdev-BLKGETSIZE-check.patch
@@ -0,0 +1,35 @@
+Last-Update: 2014-08-24
+Forwarded: https://github.com/ceph/ceph/pull/2311
+From: Michael Cree <mcree at orcon.net.nz>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756892
+Description: fix FTBFS on alpha due to incorrect check on BLKGETSIZE
+ Ceph FTBFS on Alpha with:
+
+ ~~~~
+ libtool: compile:  g++ -DHAVE_CONFIG_H -I. -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -DCEPH_LIBDIR=\"/usr/lib/alpha-linux-gnu\" -DCEPH_PKGLIBDIR=\"/usr/lib/alpha-linux-gnu/ceph\" -DGTEST_HAS_TR1_TUPLE=0 -D_FORTIFY_SOURCE=2 -I/usr/include/nss -I/usr/include/nspr -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -Werror=format-security -fno-strict-aliasing -fsigned-char -rdynamic -ftemplate-depth-1024 -Wnon-virtua [...]
+ In file included from /usr/include/alpha-linux-gnu/asm/ioctls.h:4:0,
+                  from /usr/include/alpha-linux-gnu/bits/ioctls.h:23,
+                  from /usr/include/alpha-linux-gnu/sys/ioctl.h:26,
+                  from common/blkdev.cc:3:
+ common/blkdev.cc:13:7: error: missing binary operator before token "int"
+  #elif BLKGETSIZE
+        ^
+ ~~~~
+
+ This error occurs because the value of BLKGETSIZE is tested in a
+ c-preprocessor conditional compilation test whereas the test should
+ be for existence.
+
+--- a/src/common/blkdev.cc
++++ b/src/common/blkdev.cc
+@@ -9,9 +9,9 @@
+ int get_block_device_size(int fd, int64_t *psize)
+ {
+ #ifdef BLKGETSIZE64
+   int ret = ::ioctl(fd, BLKGETSIZE64, psize);
+-#elif BLKGETSIZE
++#elif defined(BLKGETSIZE)
+   unsigned long sectors = 0;
+   int ret = ::ioctl(fd, BLKGETSIZE, &sectors);
+   *psize = sectors * 512ULL;
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 169e8a6..24098c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ arch.patch
 modules.patch
 sample.ceph.conf.patch
 virtualenv-never-download.patch
+fix-blkdev-BLKGETSIZE-check.patch

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