summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-27 16:12:01 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:30 +0000
commit60a8f94c00101eff39428ff7548f45ffe1233103 (patch)
tree82902e0d9aeb1007a3115136a028acc0c0cac1d7
parentaff9305b36e3e474d8f4a818c93ae3d7cef6997e (diff)
downloadpoky-60a8f94c00101eff39428ff7548f45ffe1233103.tar.gz
python: add md5module support
The internal md5 module is needed for using "waf" to install other python packages such as pycairo. (From OE-Core rev: 61620bd56d0696a03ffc94fbbfa2d0e25be950a5) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.2.bb6
-rw-r--r--meta/recipes-devtools/python/python/add-md5module-support.patch18
-rw-r--r--meta/recipes-devtools/python/python_2.7.2.bb3
3 files changed, 24 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.2.bb
index d036eca976..7d8c597447 100644
--- a/meta/recipes-devtools/python/python-native_2.7.2.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.2.bb
@@ -1,6 +1,6 @@
1require python.inc 1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.1" 3PR = "${INC_PR}.2"
4 4
5SRC_URI += "file://04-default-is-optimized.patch \ 5SRC_URI += "file://04-default-is-optimized.patch \
6 file://05-enable-ctypes-cross-build.patch \ 6 file://05-enable-ctypes-cross-build.patch \
@@ -11,7 +11,9 @@ SRC_URI += "file://04-default-is-optimized.patch \
11 file://debug.patch \ 11 file://debug.patch \
12 file://unixccompiler.patch \ 12 file://unixccompiler.patch \
13 file://nohostlibs.patch \ 13 file://nohostlibs.patch \
14 file://multilib.patch " 14 file://multilib.patch \
15 file://add-md5module-support.patch \
16 "
15S = "${WORKDIR}/Python-${PV}" 17S = "${WORKDIR}/Python-${PV}"
16 18
17inherit native 19inherit native
diff --git a/meta/recipes-devtools/python/python/add-md5module-support.patch b/meta/recipes-devtools/python/python/add-md5module-support.patch
new file mode 100644
index 0000000000..33fea77554
--- /dev/null
+++ b/meta/recipes-devtools/python/python/add-md5module-support.patch
@@ -0,0 +1,18 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: Python-2.7.2/Modules/Setup.dist
7===================================================================
8--- Python-2.7.2.orig/Modules/Setup.dist 2011-06-11 08:46:26.000000000 -0700
9+++ Python-2.7.2/Modules/Setup.dist 2011-12-27 15:51:41.244623219 -0800
10@@ -248,7 +248,7 @@
11 # Message-Digest Algorithm, described in RFC 1321. The necessary files
12 # md5.c and md5.h are included here.
13
14-#_md5 md5module.c md5.c
15+_md5 md5module.c md5.c
16
17
18 # The _sha module implements the SHA checksum algorithms.
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 5e8e0d7fa4..654c850759 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" 3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4PR = "${INC_PR}.4" 4PR = "${INC_PR}.5"
5 5
6DISTRO_SRC_URI ?= "file://sitecustomize.py" 6DISTRO_SRC_URI ?= "file://sitecustomize.py"
7DISTRO_SRC_URI_linuxstdbase = "" 7DISTRO_SRC_URI_linuxstdbase = ""
@@ -19,6 +19,7 @@ SRC_URI += "\
19 file://cgi_py.patch \ 19 file://cgi_py.patch \
20 file://remove_sqlite_rpath.patch \ 20 file://remove_sqlite_rpath.patch \
21 file://setup_py_skip_cross_import_check.patch \ 21 file://setup_py_skip_cross_import_check.patch \
22 file://add-md5module-support.patch \
22" 23"
23 24
24S = "${WORKDIR}/Python-${PV}" 25S = "${WORKDIR}/Python-${PV}"