diff options
| -rw-r--r-- | classes/setuptools.bbclass | 2 | ||||
| -rw-r--r-- | packages/python/python-2.5-manifest.inc | 8 | ||||
| -rw-r--r-- | packages/python/python-setuptools-native_0.6c6.bb | 8 | ||||
| -rw-r--r-- | packages/python/python-setuptools_0.6c6.bb | 7 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/classes/setuptools.bbclass b/classes/setuptools.bbclass index 17c039bf33..ced9509df2 100644 --- a/classes/setuptools.bbclass +++ b/classes/setuptools.bbclass @@ -1,6 +1,6 @@ inherit distutils -DEPENDS += "python-setuptools" +DEPENDS += "python-setuptools-native" DISTUTILS_INSTALL_ARGS = "--root=${D} \ --single-version-externally-managed \ diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index fda9f4143a..517e571166 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ -######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Apr 10 16:47:00 2008 +[?1034h######################################################################################################################## +### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu May 1 12:24:55 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -68,9 +68,9 @@ RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml0" +PR_python-compression="ml1" RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " +FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* ${libdir}/python2.5/tarfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" PR_python-re="ml0" diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb new file mode 100644 index 0000000000..1b9f90911d --- /dev/null +++ b/packages/python/python-setuptools-native_0.6c6.bb @@ -0,0 +1,8 @@ +require python-setuptools_${PV}.bb + +DEPENDS = "python-native" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py install +} diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb index ef56b9b652..721b29961e 100644 --- a/packages/python/python-setuptools_0.6c6.bb +++ b/packages/python/python-setuptools_0.6c6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT-like" -RDEPENDS = "python-core python-zlib" +RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" PR = "ml1" @@ -15,8 +15,3 @@ inherit distutils do_install_prepend() { install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages } - -do_stage() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install -} diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 325e541b97..7f30badfad 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 = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.5" |