diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 18:55:19 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:06:46 +0000 |
| commit | aea42f59c8331c4d5944f698453bfd663aa0c59d (patch) | |
| tree | edc9e0e03bb95d592a0ee94d2d3002e165c03c76 | |
| parent | af92ac8ef84a689a9c22dce6b06e5e813dce88dc (diff) | |
| download | openembedded-core-aea42f59c8331c4d5944f698453bfd663aa0c59d.tar.gz openembedded-core-aea42f59c8331c4d5944f698453bfd663aa0c59d.tar.bz2 openembedded-core-aea42f59c8331c4d5944f698453bfd663aa0c59d.zip | |
python: fix B != S
And bump PR to avoid:
gcc: error: Parser/tokenizer_pgen.o: No such file or directory
gcc: error: Parser/printgrammar.o: No such file or directory
gcc: error: Parser/pgenmain.o: No such file or directory
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-devtools/python/python.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.3.3.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python_2.7.3.bb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 19942baeb0..bc5e5b91f7 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSFv2" SECTION = "devel/python" # bump this on every change in contrib/python/generate-manifest-2.7.py -INC_PR = "r0" +INC_PR = "r1" LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6" @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a3 PYTHON_MAJMIN = "2.7" -inherit autotools-brokensep +inherit autotools PYTHONLSBOPTS = "--with-wctype-functions" PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8" diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb index 2c1f63f5b8..efa98c09fa 100644 --- a/meta/recipes-devtools/python/python3_3.3.3.bb +++ b/meta/recipes-devtools/python/python3_3.3.3.bb @@ -76,7 +76,7 @@ do_configure_prepend() { do_compile() { # regenerate platform specific files, because they depend on system headers - cd Lib/plat-linux* + cd ${S}/Lib/plat-linux* include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python3-native/python3 \ ${S}/Tools/scripts/h2py.py -i '(u_long)' \ ${STAGING_INCDIR}/dlfcn.h \ @@ -108,7 +108,7 @@ do_compile() { install -m 0644 Makefile Makefile.sysroot export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -136,7 +136,7 @@ do_install() { install -m 0644 Makefile.orig Makefile export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" install -d ${D}${libdir}/pkgconfig install -d ${D}${libdir}/python${PYTHON_MAJMIN}/config diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index 9ded75b373..90b397f3ce 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -61,7 +61,7 @@ do_configure_prepend() { do_compile() { # regenerate platform specific files, because they depend on system headers - cd Lib/plat-linux2 + cd ${S}/Lib/plat-linux2 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \ ${S}/Tools/scripts/h2py.py -i '(u_long)' \ ${STAGING_INCDIR}/dlfcn.h \ @@ -93,7 +93,7 @@ do_compile() { install -m 0644 Makefile Makefile.sysroot export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ @@ -110,7 +110,7 @@ do_install() { install -m 0644 Makefile.orig Makefile export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" # After swizzling the makefile, we need to run the build again. # install can race with the build so we have to run this first, then install |