summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 11:17:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:13:12 +0100
commit47fb8946458d6053b4404ee2e57f23661352680d (patch)
treee335246bae1cea6b362c41bd6d0bc8246fd3272f
parentbf8735f83b3ad2e7366205cfb00625c335a4f910 (diff)
downloadpoky-47fb8946458d6053b4404ee2e57f23661352680d.tar.gz
python: Fix libdir usage which broke python packaging
(From OE-Core rev: 0637d977d44555726c9aad704c97502b0fa549fa) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python/multilib.patch2
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch
index e8689e4386..33a334189e 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/meta/recipes-devtools/python/python/multilib.patch
@@ -243,7 +243,7 @@ Index: Python-2.6.6/configure.in
243 243
244+AC_SUBST(LIB) 244+AC_SUBST(LIB)
245+AC_MSG_CHECKING(LIB) 245+AC_MSG_CHECKING(LIB)
246+LIB=`basename ${LIBDIR}` 246+LIB=`basename ${libdir}`
247+AC_MSG_RESULT($LIB) 247+AC_MSG_RESULT($LIB)
248 248
249 AC_SUBST(LIBRARY) 249 AC_SUBST(LIBRARY)
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index b324eb9129..800ba04142 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.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}.7" 4PR = "${INC_PR}.8"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
6 6
7DISTRO_SRC_URI ?= "file://sitecustomize.py" 7DISTRO_SRC_URI ?= "file://sitecustomize.py"