From aaaac4c545623d8818de2d3fa71d9d63b717c575 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 21 Aug 2007 15:08:10 +0000 Subject: classes/distutils.bbclass: remove easy-install.pth, since this ends up in every package and Python 2.5 seems to be able to import .egg packages even without it --- classes/distutils.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/distutils.bbclass') diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 9f699bc7f0..8a34594a70 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -42,6 +42,7 @@ distutils_do_install() { done fi + rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth } EXPORT_FUNCTIONS do_compile do_install -- cgit v1.2.3 From 1ad1eead848e02c6eea27c34e869126d81cb6355 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 22 Aug 2007 13:47:30 +0000 Subject: distutils.bbclass: always install staging directory before calling python --- classes/distutils.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/distutils.bbclass') diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 8a34594a70..c07a9911cd 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,7 +13,8 @@ distutils_stage_headers() { } distutils_stage_all() { - PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \ + install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \ oefatal "python setup.py install (stage) execution failed." -- cgit v1.2.3