[Python-modules-commits] [python-llfuse] 03/03: merge patched into master

[Nikolaus Rath]

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

nikratio-guest pushed a commit to branch master
in repository python-llfuse.

commit 389494e7fa52ea1c9177286b180b4aec7010d9d3
Merge: 078b3ac 8d0b3c6
Author: Nikolaus Rath <Nikolaus at rath.org>
Date:   Mon Feb 1 09:40:15 2016 -0800

    merge patched into master

 debian/.git-dpm                |  4 ++--
 debian/patches/mips_dev_t.diff | 53 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 src/llfuse.pyx                 | 19 ++++++++++++++-
 4 files changed, 74 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 58b9247,0000000..8c45446
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9c1ab2d3c7c9f0b255a77e61185552ff61202260
- 9c1ab2d3c7c9f0b255a77e61185552ff61202260
++8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc
++8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc
 +1de78f8c7c630dbc2338f5a51ed35328e2f79449
 +1de78f8c7c630dbc2338f5a51ed35328e2f79449
 +python-llfuse_0.42.1+dfsg.orig.tar.gz
 +23b9a0256f43de3fc8c232ffebfcbde852aee315
 +254890
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/mips_dev_t.diff
index 0000000,0000000..fb84957
new file mode 100644
--- /dev/null
+++ b/debian/patches/mips_dev_t.diff
@@@ -1,0 -1,0 +1,53 @@@
++From 8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc Mon Sep 17 00:00:00 2001
++From: Nikolaus Rath <Nikolaus at rath.org>
++Date: Mon, 1 Feb 2016 09:40:04 -0800
++Subject: Work around bug in mips+mipsel libc
++
++Forwarded: no
++Patch-Name: mips_dev_t.diff
++
++On mips and mipsel, the st_dev and st_rdev members of struct stat do not
++have type dev_t. This breaks POSIX compatibility, but is difficult to fix
++(cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
++
++To work around the issue, we change the definition of struct stat that
++is used by Cython when we are compiling under mips. Note that this
++requires the Cython compilation to run under mips, and that the
++resulting C file will be mips specific (without the patch, the
++generated C file is suitable for any architecture).
++
++Upstream is not interested in this change for obvious reasons.
++---
++ src/llfuse.pyx | 19 ++++++++++++++++++-
++ 1 file changed, 18 insertions(+), 1 deletion(-)
++
++diff --git a/src/llfuse.pyx b/src/llfuse.pyx
++index 53a6..8754 100644
++--- a/src/llfuse.pyx
+++++ b/src/llfuse.pyx
++@@ -20,7 +20,24 @@ cdef extern from "llfuse.h":
++ 
++ from fuse_lowlevel cimport *
++ from pthread cimport *
++-from posix.stat cimport struct_stat, S_IFMT, S_IFDIR, S_IFREG
+++IF UNAME_MACHINE.startswith('mips64'):
+++    cdef extern from "sys/stat.h" nogil:
+++      struct stat:
+++        int       st_dev
+++       ino_t     st_ino
+++        mode_t    st_mode
+++        nlink_t   st_nlink
+++        uid_t     st_uid
+++        gid_t     st_gid
+++        int       st_rdev
+++        off_t     st_size
+++        blksize_t st_blksize
+++        blkcnt_t  st_blocks
+++        time_t    st_atime
+++        time_t    st_mtime
+++        time_t    st_ctime
+++ELSE:
+++    from posix.stat cimport struct_stat, S_IFMT, S_IFDIR, S_IFREG
++ from posix.types cimport mode_t, dev_t, off_t
++ from libc.stdint cimport uint32_t
++ from libc.stdlib cimport const_char
diff --cc debian/patches/series
index 350d05f,0000000..4601679
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +use-local-intersphinx-inventory.patch
 +force_xattr_api.diff
++mips_dev_t.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git