summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-2.7-manifest.inc
diff options
context:
space:
mode:
authorMagnus Olsson <magnus@minimum.se>2014-12-05 11:03:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:56 +0000
commit2b945a95444b722ac97c78783dd82f8d65b0254e (patch)
treed3e4af0b0b070f35fe21d2f1a55e06a4435861c6 /meta/recipes-devtools/python/python-2.7-manifest.inc
parent34995442a2ff07272afd497e0f94affdcc9ef963 (diff)
downloadpoky-2b945a95444b722ac97c78783dd82f8d65b0254e.tar.gz
python: add python-codecs runtime dependency for python-json
A piece of JSON initialization code that runs when you "import json" tries to use the hex-decoder, thus breaks if you do not have python-codecs installed. Example: >>> import json Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python2.7/json/__init__.py", line 108, in <module> from .decoder import JSONDecoder File "/usr/lib/python2.7/json/decoder.py", line 24, in <module> NaN, PosInf, NegInf = _floatconstants() File "/usr/lib/python2.7/json/decoder.py", line 18, in _floatconstants _BYTES = '7FF80000000000007FF0000000000000'.decode('hex') LookupError: no codec search functions registered: can't find encoding This patch adds a runtime dependency on python-codecs for python-json and re-generates the python manifests for Python v2.7. Solves [YOCTO #7020]. (From OE-Core rev: 90fd48144f146f455b18372a9b061314ab3a3857) Signed-off-by: Magnus Olsson <magnus@minimum.se> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-2.7-manifest.inc')
-rw-r--r--meta/recipes-devtools/python/python-2.7-manifest.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 9a514b1fc2..5c2629e851 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -126,7 +126,7 @@ RDEPENDS_${PN}-io="${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient"
126FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* " 126FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* "
127 127
128SUMMARY_${PN}-json="Python JSON support" 128SUMMARY_${PN}-json="Python JSON support"
129RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" 129RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re ${PN}-codecs"
130FILES_${PN}-json="${libdir}/python2.7/json ${libdir}/python2.7/lib-dynload/_json.so " 130FILES_${PN}-json="${libdir}/python2.7/json ${libdir}/python2.7/lib-dynload/_json.so "
131 131
132SUMMARY_${PN}-lang="Python low-level language support" 132SUMMARY_${PN}-lang="Python low-level language support"