diff options
| author | Morgan Little <morgan.little@windriver.com> | 2012-07-19 13:46:07 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-22 11:40:07 +0100 |
| commit | 284a65d55f0ffad0f4f7f32d72da0f9410578643 (patch) | |
| tree | 4cfb83c15a8a42f7a62121106c0d170e62ebf44a /meta/recipes-devtools/python | |
| parent | a2e554f731437545e9483a7a73e6847c03f6f48a (diff) | |
| download | openembedded-core-284a65d55f0ffad0f4f7f32d72da0f9410578643.tar.gz openembedded-core-284a65d55f0ffad0f4f7f32d72da0f9410578643.tar.bz2 openembedded-core-284a65d55f0ffad0f4f7f32d72da0f9410578643.zip | |
python: Update for python-native changes
Add pythonnative onto the list of inherits and update the paths to the binaries
referenced in the recipe to the new paths.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python_2.7.3.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index b736cc2b5e..d27ff05a18 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" @@ -30,7 +30,7 @@ SRC_URI += "\ S = "${WORKDIR}/Python-${PV}" -inherit autotools multilib_header +inherit autotools multilib_header pythonnative # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( @@ -45,7 +45,7 @@ do_configure_prepend() { do_compile() { # regenerate platform specific files, because they depend on system headers cd Lib/plat-linux2 - include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python \ + include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \ ${S}/Tools/scripts/h2py.py -i '(u_long)' \ ${STAGING_INCDIR}/dlfcn.h \ ${STAGING_INCDIR}/linux/cdrom.h \ @@ -89,8 +89,8 @@ do_compile() { export CROSS_COMPILE="${TARGET_PREFIX}" - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ @@ -99,8 +99,8 @@ do_compile() { oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ @@ -115,8 +115,8 @@ do_install() { export CROSS_COMPILE="${TARGET_PREFIX}" - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ |