01/02: gnu: python2-cython: Fix build on 32-bit platforms.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit a3dea99107e20e3e50e9b766850254c87accde49
Author: Marius Bakke <address@hidden>
Date:   Tue Apr 4 17:35:35 2017 +0200

    gnu: python2-cython: Fix build on 32-bit platforms.
    
    * gnu/packages/python.scm (python-cython, python2-cython)[source]: Add 
patch.
    * gnu/packages/patches/python-cython-fix-tests-32bit.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |  1 +
 .../patches/python-cython-fix-tests-32bit.patch    | 27 ++++++++++++++++++++++
 gnu/packages/python.scm                            |  1 +
 3 files changed, 29 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 15087b1..425c233 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -878,6 +878,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-statsmodels-fix-tests.patch      \
   %D%/packages/patches/python-configobj-setuptools.patch       \
+  %D%/packages/patches/python-cython-fix-tests-32bit.patch     \
   %D%/packages/patches/python-fake-factory-fix-build-32bit.patch       \
   %D%/packages/patches/python-faker-fix-build-32bit.patch      \
   %D%/packages/patches/python-pandas-skip-failing-tests.patch  \
diff --git a/gnu/packages/patches/python-cython-fix-tests-32bit.patch 
b/gnu/packages/patches/python-cython-fix-tests-32bit.patch
new file mode 100644
index 0000000..7ccc11d
--- /dev/null
+++ b/gnu/packages/patches/python-cython-fix-tests-32bit.patch
@@ -0,0 +1,27 @@
+This fixes a test failure on 32-bit platforms.
+
+Upstream bug URL: https://github.com/cython/cython/issues/1548
+
+Patch copied from upstream source repository:
+
+https://github.com/cython/cython/commit/d92a718a26c9354fbf35f31a17de5c069865a447
+
+From d92a718a26c9354fbf35f31a17de5c069865a447 Mon Sep 17 00:00:00 2001
+From: Robert Bradshaw <address@hidden>
+Date: Tue, 24 Jan 2017 16:57:00 -0800
+Subject: [PATCH] Normalize possible L suffix.
+
+---
+ tests/run/cpdef_enums.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/run/cpdef_enums.pyx b/tests/run/cpdef_enums.pyx
+index 167c762..c264ec5 100644
+--- a/tests/run/cpdef_enums.pyx
++++ b/tests/run/cpdef_enums.pyx
+@@ -93,4 +93,4 @@ def verify_resolution_GH1533():
+     3
+     """
+     THREE = 100
+-    return PyxEnum.THREE
++    return int(PyxEnum.THREE)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e9ccc7d..0746af2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3406,6 +3406,7 @@ is designed to have a low barrier to entry.")
      (origin
        (method url-fetch)
        (uri (pypi-uri "Cython" version))
+       (patches (search-patches "python-cython-fix-tests-32bit.patch"))
        (sha256
         (base32
          "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"))))