summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-04-09 05:01:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 11:48:37 (GMT)
commitf03d66bcc1fde80fd8923a400d2f2edfee576068 (patch)
tree1cd765229b939537888d879045cd9909f098be58
parentb23b2b42a0c1ff6243227cb7d38c8cb6ae388bcf (diff)
downloadpoky-f03d66bcc1fde80fd8923a400d2f2edfee576068.tar.gz
python: multilib header support.
Add intercept multilib header for pyconfig.h in python. This is part of the bug fixing [YOCTO #2216]. (From OE-Core rev: 99591085186c465f2ddfaef08f419ec7584d4522) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-2.7-manifest.inc2
-rw-r--r--meta/recipes-devtools/python/python.inc2
-rw-r--r--meta/recipes-devtools/python/python_2.7.2.bb4
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py2
4 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index ca01553..1e16c6b 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -40,7 +40,7 @@ FILES_${PN}-compression="${libdir}/python2.7/gzip.* ${libdir}/python2.7/zipfile.
40DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)" 40DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)"
41RDEPENDS_${PN}-core="${PN}-lang ${PN}-re" 41RDEPENDS_${PN}-core="${PN}-lang ${PN}-re"
42FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so \ 42FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so \
43${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " 43${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py "
44 44
45DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support" 45DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support"
46RDEPENDS_${PN}-crypt="${PN}-core" 46RDEPENDS_${PN}-crypt="${PN}-core"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index aaf11ac..2f17b00 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 = "r1" 6INC_PR = "r2"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=2dffb81509b47974467ea23409909b1c" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=2dffb81509b47974467ea23409909b1c"
9 9
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 53e994f..d1d0d83 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -25,7 +25,7 @@ SRC_URI += "\
25 25
26S = "${WORKDIR}/Python-${PV}" 26S = "${WORKDIR}/Python-${PV}"
27 27
28inherit autotools 28inherit autotools multilib_header
29 29
30# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources 30# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
31#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( 31#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
@@ -113,6 +113,8 @@ do_install() {
113 if [ -e ${WORKDIR}/sitecustomize.py ]; then 113 if [ -e ${WORKDIR}/sitecustomize.py ]; then
114 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} 114 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
115 fi 115 fi
116
117 oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h
116} 118}
117 119
118SSTATE_SCAN_FILES += "Makefile" 120SSTATE_SCAN_FILES += "Makefile"
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index 267d678..7b43137 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -169,7 +169,7 @@ if __name__ == "__main__":
169 "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " + 169 "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " +
170 "lib-dynload/xreadlines.so types.* platform.* ${bindir}/python* " + 170 "lib-dynload/xreadlines.so types.* platform.* ${bindir}/python* " +
171 "_weakrefset.* sysconfig.* config/Makefile " + 171 "_weakrefset.* sysconfig.* config/Makefile " +
172 "${includedir}/python${PYTHON_MAJMIN}/pyconfig.h " + 172 "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h " +
173 "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ") 173 "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ")
174 174
175 m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core", 175 m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core",