Attachment 914636 Details for Bug 1116239 – Fix FTBFS on aarch64 (#1116239)

[patch] Fix FTBFS on aarch64 (#1116239)

Fix-FTBFS-on-aarch64-1116239.patch (text/plain), 4.28 KB, created by Yaakov Selkowitz on 2014-07-04 05:08:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-07-04 05:08:32 UTC

Size: 4.28 KB

patch

obsolete

>From 2d764e0a4db14effa5ab26dd08db282fcc7930b9 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Fri, 4 Jul 2014 00:01:34 -0500
>Subject: [PATCH] Fix FTBFS on aarch64 (#1116239)
>
>---
> python-subprocess32.spec         |  8 +++++-
> python3-backport-getdents64.diff | 56 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 63 insertions(+), 1 deletion(-)
> create mode 100644 python3-backport-getdents64.diff
>
>diff --git a/python-subprocess32.spec b/python-subprocess32.spec
>index 3288c10..df29e09 100644
>--- a/python-subprocess32.spec
>+++ b/python-subprocess32.spec
>@@ -8,12 +8,14 @@
> 
> Name:           python-subprocess32
> Version:        3.2.5
>-Release:        0.2.rc1%{?dist}
>+Release:        0.3.rc1%{?dist}
> Summary:        Backport of subprocess module from Python 3.2 to Python 2.*
> 
> License:        Python
> URL:            http://pypi.python.org/pypi/subprocess32/
> Source0:        http://python-subprocess32.googlecode.com/files/subprocess32-%{version}rc1.tar.gz
>+# aarch64 does not provide the deprecated SYS_getdents syscall
>+Patch0:         python3-backport-getdents64.diff
> 
> BuildRequires:  python2-devel
> BuildRequires:  python-test
>@@ -24,6 +26,7 @@ Backport of the subprocess module from Python 3.2 for use on 2.x.
> 
> %prep
> %setup -q -n subprocess32-%{version}rc1
>+%patch0 -p2
> 
> 
> %build
>@@ -47,6 +50,9 @@ PYTHONPATH=$(pwd) %{__python} test_subprocess32.py
> 
> 
> %changelog
>+* Fri Jul 04 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.2.5-0.3.rc1
>+- Fix FTBFS on aarch64 (#1116239)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-0.2.rc1
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/python3-backport-getdents64.diff b/python3-backport-getdents64.diff
>new file mode 100644
>index 0000000..9209b27
>--- /dev/null
>+++ b/python3-backport-getdents64.diff
>@@ -0,0 +1,56 @@
>+
>+# HG changeset patch
>+# User Gregory P. Smith <greg@krypto.org>
>+# Date 1362336807 28800
>+# Node ID 7ab1c55fcf827af229b031f908837146630b2fc9
>+# Parent  f1d3fbcd837d385cf265b0c27f08f811bb67bf1a# Parent  30e643e36bae6fbf8ede27168f30d509ee2d469a
>+Fixes Issue #16962: Use getdents64 instead of the obsolete getdents syscall
>+in the subprocess module on Linux.
>+
>+diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
>+--- a/Modules/_posixsubprocess.c
>++++ b/Modules/_posixsubprocess.c
>+@@ -176,17 +176,11 @@ static void
>+  * This structure is very old and stable: It will not change unless the kernel
>+  * chooses to break compatibility with all existing binaries.  Highly Unlikely.
>+  */
>+-struct linux_dirent {
>+-#if defined(__x86_64__) && defined(__ILP32__)
>+-   /* Support the wacky x32 ABI (fake 32-bit userspace speaking to x86_64
>+-    * kernel interfaces) - https://sites.google.com/site/x32abi/ */
>++struct linux_dirent64 {
>+    unsigned long long d_ino;
>+-   unsigned long long d_off;
>+-#else
>+-   unsigned long  d_ino;        /* Inode number */
>+-   unsigned long  d_off;        /* Offset to next linux_dirent */
>+-#endif
>++   long long d_off;
>+    unsigned short d_reclen;     /* Length of this linux_dirent */
>++   unsigned char  d_type;
>+    char           d_name[256];  /* Filename (null-terminated) */
>+ };
>+ 
>+@@ -228,16 +222,16 @@ static void
>+         _close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep);
>+         return;
>+     } else {
>+-        char buffer[sizeof(struct linux_dirent)];
>++        char buffer[sizeof(struct linux_dirent64)];
>+         int bytes;
>+-        while ((bytes = syscall(SYS_getdents, fd_dir_fd,
>+-                                (struct linux_dirent *)buffer,
>++        while ((bytes = syscall(SYS_getdents64, fd_dir_fd,
>++                                (struct linux_dirent64 *)buffer,
>+                                 sizeof(buffer))) > 0) {
>+-            struct linux_dirent *entry;
>++            struct linux_dirent64 *entry;
>+             int offset;
>+             for (offset = 0; offset < bytes; offset += entry->d_reclen) {
>+                 int fd;
>+-                entry = (struct linux_dirent *)(buffer + offset);
>++                entry = (struct linux_dirent64 *)(buffer + offset);
>+                 if ((fd = _pos_int_from_ascii(entry->d_name)) < 0)
>+                     continue;  /* Not a number. */
>+                 if (fd != fd_dir_fd && fd >= start_fd && fd < end_fd &&
>+
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1116239: 914636