diff options
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-efl.inc | 4 | ||||
| -rw-r--r-- | packages/python/python-setuptools-native_0.6c6.bb | 1 | ||||
| -rw-r--r-- | packages/python/python-setuptools_0.6c6.bb | 2 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb | 7 |
4 files changed, 9 insertions, 5 deletions
diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 1cbec65fa5..0147813115 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -15,13 +15,13 @@ S = "${WORKDIR}/${PN}" do_install_append() { if [ -e examples ]; then for i in `find examples -name "*.edc"`; do - pushd `dirname $i` + cd ${S}/`dirname $i` echo "Generating .edj file for $i..." edje_cc `basename $i` echo "Removing sources in this directory..." rm -f *.edc *.png *.ttf *.jpeg - popd done + cd ${S} install -d ${D}${datadir}/${PN}/ cp -a examples ${D}${datadir}/${PN}/ find ${D}${datadir}/${PN}/examples -name "CVS" | xargs rm -rf diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb index 1b9f90911d..b7716d8cac 100644 --- a/packages/python/python-setuptools-native_0.6c6.bb +++ b/packages/python/python-setuptools-native_0.6c6.bb @@ -1,4 +1,5 @@ require python-setuptools_${PV}.bb +inherit native DEPENDS = "python-native" diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb index 721b29961e..fe78e585f7 100644 --- a/packages/python/python-setuptools_0.6c6.bb +++ b/packages/python/python-setuptools_0.6c6.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "MIT-like" RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" -PR = "ml1" +PR = "ml2" SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 7f30badfad..22aac7c9ee 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml3" +PR = "ml4" PYTHON_MAJMIN = "2.5" @@ -68,7 +68,7 @@ do_stage() { do_install() { install -m 0644 Makefile.orig Makefile - + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -77,6 +77,9 @@ do_install() { DESTDIR=${D} LIBDIR=${libdir} install install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} + + # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 + sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile } require python-${PYTHON_MAJMIN}-manifest.inc |