[meta-oe,meta-efl,PATCHv2,16/25] python-cython: add patch to fix build error with some distutils packages

Submitted by Martin Jansa on Oct. 3, 2011, 1:27 p.m. | Patch ID: 12663

Details

Message ID 77916aac94ce6836ab989d4a6e137f0eaca5f1f0.1317648011.git.Martin.Jansa@gmail.com
State Accepted, archived
Headers show

Commit Message

Martin Jansa Oct. 3, 2011, 1:27 p.m.
* fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py
  when using python-2.6 or python-2.7 (don't know about python-3*)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...pend-docs-to-_Extension.extension.__doc__.patch |   27 ++++++++++++++++++++
 .../python/python-cython_0.15.1.bb                 |    5 +++-
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch b/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
new file mode 100644
index 0000000..9b9dd46
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
@@ -0,0 +1,27 @@ 
+From bfed128dfe9551a3a40b1ac4269f18ecfeac80a9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 1 Oct 2011 11:46:30 +0200
+Subject: [PATCH] Don't append docs to _Extension.extension.__doc__
+
+* here it fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Cython/Distutils/extension.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/Cython/Distutils/extension.py b/Cython/Distutils/extension.py
+index a5a6638..e76c1e7 100644
+--- a/Cython/Distutils/extension.py
++++ b/Cython/Distutils/extension.py
+@@ -16,7 +16,6 @@ except ImportError:
+     warnings = None
+ 
+ class Extension(_Extension.Extension):
+-    _Extension.Extension.__doc__ + \
+     """pyrex_include_dirs : [string]
+         list of directories to search for Pyrex header files (.pxd) (in
+         Unix form for portability)
+-- 
+1.7.6.1
+
diff --git a/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
index f22a473..3b85601 100644
--- a/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
+++ b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
@@ -6,8 +6,11 @@  LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
 SRCNAME = "Cython"
 BBCLASSEXTEND = "native"
+PR = "r1"
 
-SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz \
+           file://0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 SRC_URI[md5sum] = "171021b3845c9ca8bd6d8185b3cde664"