summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-12 18:55:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:27 +0000
commit55a45864ead1a47b144b3c4583e82c086700d16f (patch)
treeb8991a36e4e4b5267c38b0fb0d40b9ae9b2d31cf /meta/recipes-devtools
parent84a76b28eafe6cbca79beea60909f10008db47fc (diff)
downloadpoky-55a45864ead1a47b144b3c4583e82c086700d16f.tar.gz
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 (From OE-Core rev: aea42f59c8331c4d5944f698453bfd663aa0c59d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python.inc4
-rw-r--r--meta/recipes-devtools/python/python3_3.3.3.bb6
-rw-r--r--meta/recipes-devtools/python/python_2.7.3.bb6
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"
3LICENSE = "PSFv2" 3LICENSE = "PSFv2"
4SECTION = "devel/python" 4SECTION = "devel/python"
5# bump this on every change in contrib/python/generate-manifest-2.7.py 5# bump this on every change in contrib/python/generate-manifest-2.7.py
6INC_PR = "r0" 6INC_PR = "r1"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
9 9
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a3
14 14
15PYTHON_MAJMIN = "2.7" 15PYTHON_MAJMIN = "2.7"
16 16
17inherit autotools-brokensep 17inherit autotools
18 18
19PYTHONLSBOPTS = "--with-wctype-functions" 19PYTHONLSBOPTS = "--with-wctype-functions"
20PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8" 20PYTHONLSBOPTS_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() {
76 76
77do_compile() { 77do_compile() {
78 # regenerate platform specific files, because they depend on system headers 78 # regenerate platform specific files, because they depend on system headers
79 cd Lib/plat-linux* 79 cd ${S}/Lib/plat-linux*
80 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python3-native/python3 \ 80 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python3-native/python3 \
81 ${S}/Tools/scripts/h2py.py -i '(u_long)' \ 81 ${S}/Tools/scripts/h2py.py -i '(u_long)' \
82 ${STAGING_INCDIR}/dlfcn.h \ 82 ${STAGING_INCDIR}/dlfcn.h \
@@ -108,7 +108,7 @@ do_compile() {
108 install -m 0644 Makefile Makefile.sysroot 108 install -m 0644 Makefile Makefile.sysroot
109 109
110 export CROSS_COMPILE="${TARGET_PREFIX}" 110 export CROSS_COMPILE="${TARGET_PREFIX}"
111 export PYTHONBUILDDIR="${S}" 111 export PYTHONBUILDDIR="${B}"
112 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ 112 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \
113 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ 113 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \
114 STAGING_LIBDIR=${STAGING_LIBDIR} \ 114 STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -136,7 +136,7 @@ do_install() {
136 install -m 0644 Makefile.orig Makefile 136 install -m 0644 Makefile.orig Makefile
137 137
138 export CROSS_COMPILE="${TARGET_PREFIX}" 138 export CROSS_COMPILE="${TARGET_PREFIX}"
139 export PYTHONBUILDDIR="${S}" 139 export PYTHONBUILDDIR="${B}"
140 install -d ${D}${libdir}/pkgconfig 140 install -d ${D}${libdir}/pkgconfig
141 install -d ${D}${libdir}/python${PYTHON_MAJMIN}/config 141 install -d ${D}${libdir}/python${PYTHON_MAJMIN}/config
142 142
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() {
61 61
62do_compile() { 62do_compile() {
63 # regenerate platform specific files, because they depend on system headers 63 # regenerate platform specific files, because they depend on system headers
64 cd Lib/plat-linux2 64 cd ${S}/Lib/plat-linux2
65 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \ 65 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
66 ${S}/Tools/scripts/h2py.py -i '(u_long)' \ 66 ${S}/Tools/scripts/h2py.py -i '(u_long)' \
67 ${STAGING_INCDIR}/dlfcn.h \ 67 ${STAGING_INCDIR}/dlfcn.h \
@@ -93,7 +93,7 @@ do_compile() {
93 install -m 0644 Makefile Makefile.sysroot 93 install -m 0644 Makefile Makefile.sysroot
94 94
95 export CROSS_COMPILE="${TARGET_PREFIX}" 95 export CROSS_COMPILE="${TARGET_PREFIX}"
96 export PYTHONBUILDDIR="${S}" 96 export PYTHONBUILDDIR="${B}"
97 97
98 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ 98 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
99 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ 99 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
@@ -110,7 +110,7 @@ do_install() {
110 install -m 0644 Makefile.orig Makefile 110 install -m 0644 Makefile.orig Makefile
111 111
112 export CROSS_COMPILE="${TARGET_PREFIX}" 112 export CROSS_COMPILE="${TARGET_PREFIX}"
113 export PYTHONBUILDDIR="${S}" 113 export PYTHONBUILDDIR="${B}"
114 114
115 # After swizzling the makefile, we need to run the build again. 115 # After swizzling the makefile, we need to run the build again.
116 # install can race with the build so we have to run this first, then install 116 # install can race with the build so we have to run this first, then install