diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python-3.5-manifest.inc (renamed from meta/recipes-devtools/python/python-3.4-manifest.inc) | 126 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.5.0.bb (renamed from meta/recipes-devtools/python/python3-native_3.4.3.bb) | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pip_6.1.1.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/000-cross-compile.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/04-default-is-optimized.patch | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/makerace.patch | 28 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 140 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/use_packed_importlib.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.5.0.bb (renamed from meta/recipes-devtools/python/python3_3.4.3.bb) | 8 |
10 files changed, 218 insertions, 223 deletions
diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 97070b6fad..f44a951051 100644 --- a/meta/recipes-devtools/python/python-3.4-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. | 2 | # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. |
3 | # Generator: '../../../scripts/contrib/python/generate-manifest-3.4.py' Version 20140131 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> | 3 | # Generator: './generate-manifest-3.5.py' Version 20140131 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> |
4 | # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy | 4 | # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy |
5 | 5 | ||
6 | 6 | ||
@@ -11,55 +11,55 @@ PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-comp | |||
11 | 11 | ||
12 | SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator" | 12 | SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator" |
13 | RDEPENDS_${PN}-2to3="${PN}-core" | 13 | RDEPENDS_${PN}-2to3="${PN}-core" |
14 | FILES_${PN}-2to3="${libdir}/python3.4/lib2to3 " | 14 | FILES_${PN}-2to3="${libdir}/python3.5/lib2to3 " |
15 | 15 | ||
16 | SUMMARY_${PN}-asyncio="Python Asynchronous I/O, event loop, coroutines and tasks" | 16 | SUMMARY_${PN}-asyncio="Python Asynchronous I/O, event loop, coroutines and tasks" |
17 | RDEPENDS_${PN}-asyncio="${PN}-core" | 17 | RDEPENDS_${PN}-asyncio="${PN}-core" |
18 | FILES_${PN}-asyncio="${libdir}/python3.4/asyncio " | 18 | FILES_${PN}-asyncio="${libdir}/python3.5/asyncio " |
19 | 19 | ||
20 | SUMMARY_${PN}-audio="Python Audio Handling" | 20 | SUMMARY_${PN}-audio="Python Audio Handling" |
21 | RDEPENDS_${PN}-audio="${PN}-core" | 21 | RDEPENDS_${PN}-audio="${PN}-core" |
22 | FILES_${PN}-audio="${libdir}/python3.4/wave.* ${libdir}/python3.4/chunk.* ${libdir}/python3.4/sndhdr.* ${libdir}/python3.4/lib-dynload/ossaudiodev.*.so ${libdir}/python3.4/lib-dynload/audioop.*.so ${libdir}/python3.4/audiodev.* ${libdir}/python3.4/sunaudio.* ${libdir}/python3.4/sunau.* ${libdir}/python3.4/toaiff.* " | 22 | FILES_${PN}-audio="${libdir}/python3.5/wave.* ${libdir}/python3.5/chunk.* ${libdir}/python3.5/sndhdr.* ${libdir}/python3.5/lib-dynload/ossaudiodev.*.so ${libdir}/python3.5/lib-dynload/audioop.*.so ${libdir}/python3.5/audiodev.* ${libdir}/python3.5/sunaudio.* ${libdir}/python3.5/sunau.* ${libdir}/python3.5/toaiff.* " |
23 | 23 | ||
24 | SUMMARY_${PN}-codecs="Python codecs, encodings & i18n support" | 24 | SUMMARY_${PN}-codecs="Python codecs, encodings & i18n support" |
25 | RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang" | 25 | RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang" |
26 | FILES_${PN}-codecs="${libdir}/python3.4/codecs.* ${libdir}/python3.4/encodings ${libdir}/python3.4/gettext.* ${libdir}/python3.4/locale.* ${libdir}/python3.4/lib-dynload/_locale.*.so ${libdir}/python3.4/lib-dynload/_codecs* ${libdir}/python3.4/lib-dynload/_multibytecodec.*.so ${libdir}/python3.4/lib-dynload/unicodedata.*.so ${libdir}/python3.4/stringprep.* ${libdir}/python3.4/xdrlib.* " | 26 | FILES_${PN}-codecs="${libdir}/python3.5/codecs.* ${libdir}/python3.5/encodings ${libdir}/python3.5/gettext.* ${libdir}/python3.5/locale.* ${libdir}/python3.5/lib-dynload/_locale.*.so ${libdir}/python3.5/lib-dynload/_codecs* ${libdir}/python3.5/lib-dynload/_multibytecodec.*.so ${libdir}/python3.5/lib-dynload/unicodedata.*.so ${libdir}/python3.5/stringprep.* ${libdir}/python3.5/xdrlib.* " |
27 | 27 | ||
28 | SUMMARY_${PN}-compile="Python bytecode compilation support" | 28 | SUMMARY_${PN}-compile="Python bytecode compilation support" |
29 | RDEPENDS_${PN}-compile="${PN}-core" | 29 | RDEPENDS_${PN}-compile="${PN}-core" |
30 | FILES_${PN}-compile="${libdir}/python3.4/py_compile.* ${libdir}/python3.4/compileall.* " | 30 | FILES_${PN}-compile="${libdir}/python3.5/py_compile.* ${libdir}/python3.5/compileall.* " |
31 | 31 | ||
32 | SUMMARY_${PN}-compression="Python high-level compression support" | 32 | SUMMARY_${PN}-compression="Python high-level compression support" |
33 | RDEPENDS_${PN}-compression="${PN}-core ${PN}-codecs" | 33 | RDEPENDS_${PN}-compression="${PN}-core ${PN}-codecs" |
34 | FILES_${PN}-compression="${libdir}/python3.4/gzip.* ${libdir}/python3.4/zipfile.* ${libdir}/python3.4/tarfile.* ${libdir}/python3.4/lib-dynload/bz2.*.so " | 34 | FILES_${PN}-compression="${libdir}/python3.5/gzip.* ${libdir}/python3.5/zipfile.* ${libdir}/python3.5/tarfile.* ${libdir}/python3.5/lib-dynload/bz2.*.so " |
35 | 35 | ||
36 | SUMMARY_${PN}-core="Python interpreter and core modules" | 36 | SUMMARY_${PN}-core="Python interpreter and core modules" |
37 | RDEPENDS_${PN}-core="${PN}-lang ${PN}-re ${PN}-reprlib ${PN}-codecs ${PN}-io ${PN}-math" | 37 | RDEPENDS_${PN}-core="${PN}-lang ${PN}-re ${PN}-reprlib ${PN}-codecs ${PN}-io ${PN}-math" |
38 | FILES_${PN}-core="${libdir}/python3.4/__future__.* ${libdir}/python3.4/_abcoll.* ${libdir}/python3.4/abc.* ${libdir}/python3.4/copy.* ${libdir}/python3.4/copyreg.* ${libdir}/python3.4/ConfigParser.* ${libdir}/python3.4/genericpath.* ${libdir}/python3.4/getopt.* ${libdir}/python3.4/linecache.* ${libdir}/python3.4/new.* ${libdir}/python3.4/os.* ${libdir}/python3.4/posixpath.* ${libdir}/python3.4/struct.* ${libdir}/python3.4/warnings.* ${libdir}/python3.4/site.* ${libdir}/python3.4/stat.* ${libdir}/python3.4/UserDict.* ${libdir}/python3.4/UserList.* ${libdir}/python3.4/UserString.* ${libdir}/python3.4/lib-dynload/binascii.*.so ${libdir}/python3.4/lib-dynload/_struct.*.so ${libdir}/python3.4/lib-dynload/time.*.so ${libdir}/python3.4/lib-dynload/xreadlines.*.so ${libdir}/python3.4/types.* ${libdir}/python3.4/platform.* ${bindir}/python* ${libdir}/python3.4/_weakrefset.* ${libdir}/python3.4/sysconfig.* ${libdir}/python3.4/_sysconfigdata.* ${libdir}/python3.4/config/Makefile ${includedir}/python${PYTHON_BINABI}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/collections ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " | 38 | FILES_${PN}-core="${libdir}/python3.5/__future__.* ${libdir}/python3.5/_abcoll.* ${libdir}/python3.5/abc.* ${libdir}/python3.5/copy.* ${libdir}/python3.5/copyreg.* ${libdir}/python3.5/ConfigParser.* ${libdir}/python3.5/genericpath.* ${libdir}/python3.5/getopt.* ${libdir}/python3.5/linecache.* ${libdir}/python3.5/new.* ${libdir}/python3.5/os.* ${libdir}/python3.5/posixpath.* ${libdir}/python3.5/struct.* ${libdir}/python3.5/warnings.* ${libdir}/python3.5/site.* ${libdir}/python3.5/stat.* ${libdir}/python3.5/UserDict.* ${libdir}/python3.5/UserList.* ${libdir}/python3.5/UserString.* ${libdir}/python3.5/lib-dynload/binascii.*.so ${libdir}/python3.5/lib-dynload/_struct.*.so ${libdir}/python3.5/lib-dynload/time.*.so ${libdir}/python3.5/lib-dynload/xreadlines.*.so ${libdir}/python3.5/types.* ${libdir}/python3.5/platform.* ${bindir}/python* ${libdir}/python3.5/_weakrefset.* ${libdir}/python3.5/sysconfig.* ${libdir}/python3.5/_sysconfigdata.* ${libdir}/python3.5/config/Makefile ${includedir}/python${PYTHON_BINABI}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/collections ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " |
39 | 39 | ||
40 | SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" | 40 | SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" |
41 | RDEPENDS_${PN}-crypt="${PN}-core" | 41 | RDEPENDS_${PN}-crypt="${PN}-core" |
42 | FILES_${PN}-crypt="${libdir}/python3.4/hashlib.* ${libdir}/python3.4/md5.* ${libdir}/python3.4/sha.* ${libdir}/python3.4/lib-dynload/crypt.*.so ${libdir}/python3.4/lib-dynload/_hashlib.*.so ${libdir}/python3.4/lib-dynload/_sha256.*.so ${libdir}/python3.4/lib-dynload/_sha512.*.so " | 42 | FILES_${PN}-crypt="${libdir}/python3.5/hashlib.* ${libdir}/python3.5/md5.* ${libdir}/python3.5/sha.* ${libdir}/python3.5/lib-dynload/crypt.*.so ${libdir}/python3.5/lib-dynload/_hashlib.*.so ${libdir}/python3.5/lib-dynload/_sha256.*.so ${libdir}/python3.5/lib-dynload/_sha512.*.so " |
43 | 43 | ||
44 | SUMMARY_${PN}-ctypes="Python C types support" | 44 | SUMMARY_${PN}-ctypes="Python C types support" |
45 | RDEPENDS_${PN}-ctypes="${PN}-core" | 45 | RDEPENDS_${PN}-ctypes="${PN}-core" |
46 | FILES_${PN}-ctypes="${libdir}/python3.4/ctypes ${libdir}/python3.4/lib-dynload/_ctypes.*.so ${libdir}/python3.4/lib-dynload/_ctypes_test.*.so " | 46 | FILES_${PN}-ctypes="${libdir}/python3.5/ctypes ${libdir}/python3.5/lib-dynload/_ctypes.*.so ${libdir}/python3.5/lib-dynload/_ctypes_test.*.so " |
47 | 47 | ||
48 | SUMMARY_${PN}-curses="Python curses support" | 48 | SUMMARY_${PN}-curses="Python curses support" |
49 | RDEPENDS_${PN}-curses="${PN}-core" | 49 | RDEPENDS_${PN}-curses="${PN}-core" |
50 | FILES_${PN}-curses="${libdir}/python3.4/curses ${libdir}/python3.4/lib-dynload/_curses.*.so ${libdir}/python3.4/lib-dynload/_curses_panel.*.so " | 50 | FILES_${PN}-curses="${libdir}/python3.5/curses ${libdir}/python3.5/lib-dynload/_curses.*.so ${libdir}/python3.5/lib-dynload/_curses_panel.*.so " |
51 | 51 | ||
52 | SUMMARY_${PN}-datetime="Python calendar and time support" | 52 | SUMMARY_${PN}-datetime="Python calendar and time support" |
53 | RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs" | 53 | RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs" |
54 | FILES_${PN}-datetime="${libdir}/python3.4/_strptime.* ${libdir}/python3.4/calendar.* ${libdir}/python3.4/lib-dynload/datetime.*.so " | 54 | FILES_${PN}-datetime="${libdir}/python3.5/_strptime.* ${libdir}/python3.5/calendar.* ${libdir}/python3.5/lib-dynload/datetime.*.so " |
55 | 55 | ||
56 | SUMMARY_${PN}-db="Python file-based database support" | 56 | SUMMARY_${PN}-db="Python file-based database support" |
57 | RDEPENDS_${PN}-db="${PN}-core" | 57 | RDEPENDS_${PN}-db="${PN}-core" |
58 | FILES_${PN}-db="${libdir}/python3.4/anydbm.* ${libdir}/python3.4/dumbdbm.* ${libdir}/python3.4/whichdb.* ${libdir}/python3.4/dbm ${libdir}/python3.4/lib-dynload/_dbm.*.so " | 58 | FILES_${PN}-db="${libdir}/python3.5/anydbm.* ${libdir}/python3.5/dumbdbm.* ${libdir}/python3.5/whichdb.* ${libdir}/python3.5/dbm ${libdir}/python3.5/lib-dynload/_dbm.*.so " |
59 | 59 | ||
60 | SUMMARY_${PN}-debugger="Python debugger" | 60 | SUMMARY_${PN}-debugger="Python debugger" |
61 | RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint ${PN}-importlib ${PN}-pkgutil" | 61 | RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint ${PN}-importlib ${PN}-pkgutil" |
62 | FILES_${PN}-debugger="${libdir}/python3.4/bdb.* ${libdir}/python3.4/pdb.* " | 62 | FILES_${PN}-debugger="${libdir}/python3.5/bdb.* ${libdir}/python3.5/pdb.* " |
63 | 63 | ||
64 | SUMMARY_${PN}-dev="Python development package" | 64 | SUMMARY_${PN}-dev="Python development package" |
65 | RDEPENDS_${PN}-dev="${PN}-core" | 65 | RDEPENDS_${PN}-dev="${PN}-core" |
@@ -67,199 +67,199 @@ FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdi | |||
67 | 67 | ||
68 | SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" | 68 | SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" |
69 | RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" | 69 | RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" |
70 | FILES_${PN}-difflib="${libdir}/python3.4/difflib.* " | 70 | FILES_${PN}-difflib="${libdir}/python3.5/difflib.* " |
71 | 71 | ||
72 | SUMMARY_${PN}-distutils="Python Distribution Utilities" | 72 | SUMMARY_${PN}-distutils="Python Distribution Utilities" |
73 | RDEPENDS_${PN}-distutils="${PN}-core" | 73 | RDEPENDS_${PN}-distutils="${PN}-core" |
74 | FILES_${PN}-distutils="${libdir}/python3.4/config ${libdir}/python3.4/distutils " | 74 | FILES_${PN}-distutils="${libdir}/python3.5/config ${libdir}/python3.5/distutils " |
75 | 75 | ||
76 | SUMMARY_${PN}-distutils-staticdev="Python distribution utilities (static libraries)" | 76 | SUMMARY_${PN}-distutils-staticdev="Python distribution utilities (static libraries)" |
77 | RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils" | 77 | RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils" |
78 | FILES_${PN}-distutils-staticdev="${libdir}/python3.4/config/lib*.a " | 78 | FILES_${PN}-distutils-staticdev="${libdir}/python3.5/config/lib*.a " |
79 | 79 | ||
80 | SUMMARY_${PN}-doctest="Python framework for running examples in docstrings" | 80 | SUMMARY_${PN}-doctest="Python framework for running examples in docstrings" |
81 | RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib" | 81 | RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib" |
82 | FILES_${PN}-doctest="${libdir}/python3.4/doctest.* " | 82 | FILES_${PN}-doctest="${libdir}/python3.5/doctest.* " |
83 | 83 | ||
84 | SUMMARY_${PN}-elementtree="Python elementree" | 84 | SUMMARY_${PN}-elementtree="Python elementree" |
85 | RDEPENDS_${PN}-elementtree="${PN}-core" | 85 | RDEPENDS_${PN}-elementtree="${PN}-core" |
86 | FILES_${PN}-elementtree="${libdir}/python3.4/lib-dynload/_elementtree.*.so " | 86 | FILES_${PN}-elementtree="${libdir}/python3.5/lib-dynload/_elementtree.*.so " |
87 | 87 | ||
88 | SUMMARY_${PN}-email="Python email support" | 88 | SUMMARY_${PN}-email="Python email support" |
89 | RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient" | 89 | RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient" |
90 | FILES_${PN}-email="${libdir}/python3.4/imaplib.* ${libdir}/python3.4/email " | 90 | FILES_${PN}-email="${libdir}/python3.5/imaplib.* ${libdir}/python3.5/email " |
91 | 91 | ||
92 | SUMMARY_${PN}-fcntl="Python's fcntl interface" | 92 | SUMMARY_${PN}-fcntl="Python's fcntl interface" |
93 | RDEPENDS_${PN}-fcntl="${PN}-core" | 93 | RDEPENDS_${PN}-fcntl="${PN}-core" |
94 | FILES_${PN}-fcntl="${libdir}/python3.4/lib-dynload/fcntl.*.so " | 94 | FILES_${PN}-fcntl="${libdir}/python3.5/lib-dynload/fcntl.*.so " |
95 | 95 | ||
96 | SUMMARY_${PN}-gdbm="Python GNU database support" | 96 | SUMMARY_${PN}-gdbm="Python GNU database support" |
97 | RDEPENDS_${PN}-gdbm="${PN}-core" | 97 | RDEPENDS_${PN}-gdbm="${PN}-core" |
98 | FILES_${PN}-gdbm="${libdir}/python3.4/lib-dynload/_gdbm.*.so " | 98 | FILES_${PN}-gdbm="${libdir}/python3.5/lib-dynload/_gdbm.*.so " |
99 | 99 | ||
100 | SUMMARY_${PN}-html="Python HTML processing support" | 100 | SUMMARY_${PN}-html="Python HTML processing support" |
101 | RDEPENDS_${PN}-html="${PN}-core" | 101 | RDEPENDS_${PN}-html="${PN}-core" |
102 | FILES_${PN}-html="${libdir}/python3.4/formatter.* ${libdir}/python3.4/htmlentitydefs.* ${libdir}/python3.4/htmllib.* ${libdir}/python3.4/markupbase.* ${libdir}/python3.4/sgmllib.* ${libdir}/python3.4/HTMLParser.* " | 102 | FILES_${PN}-html="${libdir}/python3.5/formatter.* ${libdir}/python3.5/htmlentitydefs.* ${libdir}/python3.5/htmllib.* ${libdir}/python3.5/markupbase.* ${libdir}/python3.5/sgmllib.* ${libdir}/python3.5/HTMLParser.* " |
103 | 103 | ||
104 | SUMMARY_${PN}-idle="Python Integrated Development Environment" | 104 | SUMMARY_${PN}-idle="Python Integrated Development Environment" |
105 | RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter" | 105 | RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter" |
106 | FILES_${PN}-idle="${bindir}/idle ${libdir}/python3.4/idlelib " | 106 | FILES_${PN}-idle="${bindir}/idle ${libdir}/python3.5/idlelib " |
107 | 107 | ||
108 | SUMMARY_${PN}-image="Python graphical image handling" | 108 | SUMMARY_${PN}-image="Python graphical image handling" |
109 | RDEPENDS_${PN}-image="${PN}-core" | 109 | RDEPENDS_${PN}-image="${PN}-core" |
110 | FILES_${PN}-image="${libdir}/python3.4/colorsys.* ${libdir}/python3.4/imghdr.* ${libdir}/python3.4/lib-dynload/imageop.*.so ${libdir}/python3.4/lib-dynload/rgbimg.*.so " | 110 | FILES_${PN}-image="${libdir}/python3.5/colorsys.* ${libdir}/python3.5/imghdr.* ${libdir}/python3.5/lib-dynload/imageop.*.so ${libdir}/python3.5/lib-dynload/rgbimg.*.so " |
111 | 111 | ||
112 | SUMMARY_${PN}-importlib="Python import implementation library" | 112 | SUMMARY_${PN}-importlib="Python import implementation library" |
113 | RDEPENDS_${PN}-importlib="${PN}-core" | 113 | RDEPENDS_${PN}-importlib="${PN}-core" |
114 | FILES_${PN}-importlib="${libdir}/python3.4/importlib " | 114 | FILES_${PN}-importlib="${libdir}/python3.5/importlib ${libdir}/python3.5/operator.py" |
115 | 115 | ||
116 | SUMMARY_${PN}-io="Python low-level I/O" | 116 | SUMMARY_${PN}-io="Python low-level I/O" |
117 | RDEPENDS_${PN}-io="${PN}-core ${PN}-math" | 117 | RDEPENDS_${PN}-io="${PN}-core ${PN}-math" |
118 | FILES_${PN}-io="${libdir}/python3.4/lib-dynload/_socket.*.so ${libdir}/python3.4/lib-dynload/_io.*.so ${libdir}/python3.4/lib-dynload/_ssl.*.so ${libdir}/python3.4/lib-dynload/select.*.so ${libdir}/python3.4/lib-dynload/termios.*.so ${libdir}/python3.4/lib-dynload/cStringIO.*.so ${libdir}/python3.4/pipes.* ${libdir}/python3.4/socket.* ${libdir}/python3.4/ssl.* ${libdir}/python3.4/tempfile.* ${libdir}/python3.4/StringIO.* ${libdir}/python3.4/io.* ${libdir}/python3.4/_pyio.* " | 118 | FILES_${PN}-io="${libdir}/python3.5/lib-dynload/_socket.*.so ${libdir}/python3.5/lib-dynload/_io.*.so ${libdir}/python3.5/lib-dynload/_ssl.*.so ${libdir}/python3.5/lib-dynload/select.*.so ${libdir}/python3.5/lib-dynload/termios.*.so ${libdir}/python3.5/lib-dynload/cStringIO.*.so ${libdir}/python3.5/pipes.* ${libdir}/python3.5/socket.* ${libdir}/python3.5/ssl.* ${libdir}/python3.5/tempfile.* ${libdir}/python3.5/StringIO.* ${libdir}/python3.5/io.* ${libdir}/python3.5/_pyio.* " |
119 | 119 | ||
120 | SUMMARY_${PN}-json="Python JSON support" | 120 | SUMMARY_${PN}-json="Python JSON support" |
121 | RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" | 121 | RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" |
122 | FILES_${PN}-json="${libdir}/python3.4/json ${libdir}/python3.4/lib-dynload/_json.*.so " | 122 | FILES_${PN}-json="${libdir}/python3.5/json ${libdir}/python3.5/lib-dynload/_json.*.so " |
123 | 123 | ||
124 | SUMMARY_${PN}-lang="Python low-level language support" | 124 | SUMMARY_${PN}-lang="Python low-level language support" |
125 | RDEPENDS_${PN}-lang="${PN}-core" | 125 | RDEPENDS_${PN}-lang="${PN}-core" |
126 | FILES_${PN}-lang="${libdir}/python3.4/lib-dynload/_bisect.*.so ${libdir}/python3.4/lib-dynload/_collections.*.so ${libdir}/python3.4/lib-dynload/_heapq.*.so ${libdir}/python3.4/lib-dynload/_weakref.*.so ${libdir}/python3.4/lib-dynload/_functools.*.so ${libdir}/python3.4/lib-dynload/array.*.so ${libdir}/python3.4/lib-dynload/itertools.*.so ${libdir}/python3.4/lib-dynload/operator.*.so ${libdir}/python3.4/lib-dynload/parser.*.so ${libdir}/python3.4/atexit.* ${libdir}/python3.4/bisect.* ${libdir}/python3.4/code.* ${libdir}/python3.4/codeop.* ${libdir}/python3.4/collections.* ${libdir}/python3.4/_collections_abc.* ${libdir}/python3.4/dis.* ${libdir}/python3.4/functools.* ${libdir}/python3.4/heapq.* ${libdir}/python3.4/inspect.* ${libdir}/python3.4/keyword.* ${libdir}/python3.4/opcode.* ${libdir}/python3.4/symbol.* ${libdir}/python3.4/repr.* ${libdir}/python3.4/token.* ${libdir}/python3.4/tokenize.* ${libdir}/python3.4/traceback.* ${libdir}/python3.4/weakref.* " | 126 | FILES_${PN}-lang="${libdir}/python3.5/lib-dynload/_bisect.*.so ${libdir}/python3.5/lib-dynload/_collections.*.so ${libdir}/python3.5/lib-dynload/_heapq.*.so ${libdir}/python3.5/lib-dynload/_weakref.*.so ${libdir}/python3.5/lib-dynload/_functools.*.so ${libdir}/python3.5/lib-dynload/array.*.so ${libdir}/python3.5/lib-dynload/itertools.*.so ${libdir}/python3.5/lib-dynload/operator.*.so ${libdir}/python3.5/lib-dynload/parser.*.so ${libdir}/python3.5/atexit.* ${libdir}/python3.5/bisect.* ${libdir}/python3.5/code.* ${libdir}/python3.5/codeop.* ${libdir}/python3.5/collections.* ${libdir}/python3.5/_collections_abc.* ${libdir}/python3.5/dis.* ${libdir}/python3.5/functools.* ${libdir}/python3.5/heapq.* ${libdir}/python3.5/inspect.* ${libdir}/python3.5/keyword.* ${libdir}/python3.5/opcode.* ${libdir}/python3.5/symbol.* ${libdir}/python3.5/repr.* ${libdir}/python3.5/token.* ${libdir}/python3.5/tokenize.* ${libdir}/python3.5/traceback.* ${libdir}/python3.5/weakref.* " |
127 | 127 | ||
128 | SUMMARY_${PN}-logging="Python logging support" | 128 | SUMMARY_${PN}-logging="Python logging support" |
129 | RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold" | 129 | RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold" |
130 | FILES_${PN}-logging="${libdir}/python3.4/logging " | 130 | FILES_${PN}-logging="${libdir}/python3.5/logging " |
131 | 131 | ||
132 | SUMMARY_${PN}-mailbox="Python mailbox format support" | 132 | SUMMARY_${PN}-mailbox="Python mailbox format support" |
133 | RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime" | 133 | RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime" |
134 | FILES_${PN}-mailbox="${libdir}/python3.4/mailbox.* " | 134 | FILES_${PN}-mailbox="${libdir}/python3.5/mailbox.* " |
135 | 135 | ||
136 | SUMMARY_${PN}-math="Python math support" | 136 | SUMMARY_${PN}-math="Python math support" |
137 | RDEPENDS_${PN}-math="${PN}-core" | 137 | RDEPENDS_${PN}-math="${PN}-core" |
138 | FILES_${PN}-math="${libdir}/python3.4/lib-dynload/cmath.*.so ${libdir}/python3.4/lib-dynload/math.*.so ${libdir}/python3.4/lib-dynload/_random.*.so ${libdir}/python3.4/random.* ${libdir}/python3.4/sets.* " | 138 | FILES_${PN}-math="${libdir}/python3.5/lib-dynload/cmath.*.so ${libdir}/python3.5/lib-dynload/math.*.so ${libdir}/python3.5/lib-dynload/_random.*.so ${libdir}/python3.5/random.* ${libdir}/python3.5/sets.* " |
139 | 139 | ||
140 | SUMMARY_${PN}-mime="Python MIME handling APIs" | 140 | SUMMARY_${PN}-mime="Python MIME handling APIs" |
141 | RDEPENDS_${PN}-mime="${PN}-core ${PN}-io" | 141 | RDEPENDS_${PN}-mime="${PN}-core ${PN}-io" |
142 | FILES_${PN}-mime="${libdir}/python3.4/mimetools.* ${libdir}/python3.4/uu.* ${libdir}/python3.4/quopri.* ${libdir}/python3.4/rfc822.* ${libdir}/python3.4/MimeWriter.* " | 142 | FILES_${PN}-mime="${libdir}/python3.5/mimetools.* ${libdir}/python3.5/uu.* ${libdir}/python3.5/quopri.* ${libdir}/python3.5/rfc822.* ${libdir}/python3.5/MimeWriter.* " |
143 | 143 | ||
144 | SUMMARY_${PN}-mmap="Python memory-mapped file support" | 144 | SUMMARY_${PN}-mmap="Python memory-mapped file support" |
145 | RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io" | 145 | RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io" |
146 | FILES_${PN}-mmap="${libdir}/python3.4/lib-dynload/mmap.*.so " | 146 | FILES_${PN}-mmap="${libdir}/python3.5/lib-dynload/mmap.*.so " |
147 | 147 | ||
148 | SUMMARY_${PN}-multiprocessing="Python multiprocessing support" | 148 | SUMMARY_${PN}-multiprocessing="Python multiprocessing support" |
149 | RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap" | 149 | RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap" |
150 | FILES_${PN}-multiprocessing="${libdir}/python3.4/lib-dynload/_multiprocessing.*.so ${libdir}/python3.4/multiprocessing " | 150 | FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing " |
151 | 151 | ||
152 | SUMMARY_${PN}-netclient="Python Internet Protocol clients" | 152 | SUMMARY_${PN}-netclient="Python Internet Protocol clients" |
153 | RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" | 153 | RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" |
154 | FILES_${PN}-netclient="${libdir}/python3.4/*Cookie*.* ${libdir}/python3.4/base64.* ${libdir}/python3.4/cookielib.* ${libdir}/python3.4/ftplib.* ${libdir}/python3.4/gopherlib.* ${libdir}/python3.4/hmac.* ${libdir}/python3.4/httplib.* ${libdir}/python3.4/mimetypes.* ${libdir}/python3.4/nntplib.* ${libdir}/python3.4/poplib.* ${libdir}/python3.4/smtplib.* ${libdir}/python3.4/telnetlib.* ${libdir}/python3.4/urllib ${libdir}/python3.4/uuid.* ${libdir}/python3.4/rfc822.* ${libdir}/python3.4/mimetools.* " | 154 | FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/base64.* ${libdir}/python3.5/cookielib.* ${libdir}/python3.5/ftplib.* ${libdir}/python3.5/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/httplib.* ${libdir}/python3.5/mimetypes.* ${libdir}/python3.5/nntplib.* ${libdir}/python3.5/poplib.* ${libdir}/python3.5/smtplib.* ${libdir}/python3.5/telnetlib.* ${libdir}/python3.5/urllib ${libdir}/python3.5/uuid.* ${libdir}/python3.5/rfc822.* ${libdir}/python3.5/mimetools.* " |
155 | 155 | ||
156 | SUMMARY_${PN}-netserver="Python Internet Protocol servers" | 156 | SUMMARY_${PN}-netserver="Python Internet Protocol servers" |
157 | RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient ${PN}-shell ${PN}-threading" | 157 | RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient ${PN}-shell ${PN}-threading" |
158 | FILES_${PN}-netserver="${libdir}/python3.4/cgi.* ${libdir}/python3.4/*HTTPServer.* ${libdir}/python3.4/SocketServer.* " | 158 | FILES_${PN}-netserver="${libdir}/python3.5/cgi.* ${libdir}/python3.5/*HTTPServer.* ${libdir}/python3.5/SocketServer.* " |
159 | 159 | ||
160 | SUMMARY_${PN}-numbers="Python number APIs" | 160 | SUMMARY_${PN}-numbers="Python number APIs" |
161 | RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re" | 161 | RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re" |
162 | FILES_${PN}-numbers="${libdir}/python3.4/decimal.* ${libdir}/python3.4/fractions.* ${libdir}/python3.4/numbers.* " | 162 | FILES_${PN}-numbers="${libdir}/python3.5/decimal.* ${libdir}/python3.5/fractions.* ${libdir}/python3.5/numbers.* " |
163 | 163 | ||
164 | SUMMARY_${PN}-pickle="Python serialisation/persistence support" | 164 | SUMMARY_${PN}-pickle="Python serialisation/persistence support" |
165 | RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re" | 165 | RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re" |
166 | FILES_${PN}-pickle="${libdir}/python3.4/pickle.* ${libdir}/python3.4/shelve.* ${libdir}/python3.4/lib-dynload/cPickle.*.so ${libdir}/python3.4/pickletools.* " | 166 | FILES_${PN}-pickle="${libdir}/python3.5/pickle.* ${libdir}/python3.5/shelve.* ${libdir}/python3.5/lib-dynload/cPickle.*.so ${libdir}/python3.5/pickletools.* " |
167 | 167 | ||
168 | SUMMARY_${PN}-pkgutil="Python package extension utility support" | 168 | SUMMARY_${PN}-pkgutil="Python package extension utility support" |
169 | RDEPENDS_${PN}-pkgutil="${PN}-core" | 169 | RDEPENDS_${PN}-pkgutil="${PN}-core" |
170 | FILES_${PN}-pkgutil="${libdir}/python3.4/pkgutil.* " | 170 | FILES_${PN}-pkgutil="${libdir}/python3.5/pkgutil.* " |
171 | 171 | ||
172 | SUMMARY_${PN}-pprint="Python pretty-print support" | 172 | SUMMARY_${PN}-pprint="Python pretty-print support" |
173 | RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io" | 173 | RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io" |
174 | FILES_${PN}-pprint="${libdir}/python3.4/pprint.* " | 174 | FILES_${PN}-pprint="${libdir}/python3.5/pprint.* " |
175 | 175 | ||
176 | SUMMARY_${PN}-profile="Python basic performance profiling support" | 176 | SUMMARY_${PN}-profile="Python basic performance profiling support" |
177 | RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils" | 177 | RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils" |
178 | FILES_${PN}-profile="${libdir}/python3.4/profile.* ${libdir}/python3.4/pstats.* ${libdir}/python3.4/cProfile.* ${libdir}/python3.4/lib-dynload/_lsprof.*.so " | 178 | FILES_${PN}-profile="${libdir}/python3.5/profile.* ${libdir}/python3.5/pstats.* ${libdir}/python3.5/cProfile.* ${libdir}/python3.5/lib-dynload/_lsprof.*.so " |
179 | 179 | ||
180 | SUMMARY_${PN}-pydoc="Python interactive help support" | 180 | SUMMARY_${PN}-pydoc="Python interactive help support" |
181 | RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re" | 181 | RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re" |
182 | FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python3.4/pydoc.* ${libdir}/python3.4/pydoc_data " | 182 | FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python3.5/pydoc.* ${libdir}/python3.5/pydoc_data " |
183 | 183 | ||
184 | SUMMARY_${PN}-re="Python Regular Expression APIs" | 184 | SUMMARY_${PN}-re="Python Regular Expression APIs" |
185 | RDEPENDS_${PN}-re="${PN}-core" | 185 | RDEPENDS_${PN}-re="${PN}-core" |
186 | FILES_${PN}-re="${libdir}/python3.4/re.* ${libdir}/python3.4/sre.* ${libdir}/python3.4/sre_compile.* ${libdir}/python3.4/sre_constants* ${libdir}/python3.4/sre_parse.* " | 186 | FILES_${PN}-re="${libdir}/python3.5/re.* ${libdir}/python3.5/sre.* ${libdir}/python3.5/sre_compile.* ${libdir}/python3.5/sre_constants* ${libdir}/python3.5/sre_parse.* " |
187 | 187 | ||
188 | SUMMARY_${PN}-readline="Python readline support" | 188 | SUMMARY_${PN}-readline="Python readline support" |
189 | RDEPENDS_${PN}-readline="${PN}-core" | 189 | RDEPENDS_${PN}-readline="${PN}-core" |
190 | FILES_${PN}-readline="${libdir}/python3.4/lib-dynload/readline.*.so ${libdir}/python3.4/rlcompleter.* " | 190 | FILES_${PN}-readline="${libdir}/python3.5/lib-dynload/readline.*.so ${libdir}/python3.5/rlcompleter.* " |
191 | 191 | ||
192 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" | 192 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" |
193 | RDEPENDS_${PN}-reprlib="${PN}-core" | 193 | RDEPENDS_${PN}-reprlib="${PN}-core" |
194 | FILES_${PN}-reprlib="${libdir}/python3.4/reprlib.py " | 194 | FILES_${PN}-reprlib="${libdir}/python3.5/reprlib.py " |
195 | 195 | ||
196 | SUMMARY_${PN}-resource="Python resource control interface" | 196 | SUMMARY_${PN}-resource="Python resource control interface" |
197 | RDEPENDS_${PN}-resource="${PN}-core" | 197 | RDEPENDS_${PN}-resource="${PN}-core" |
198 | FILES_${PN}-resource="${libdir}/python3.4/lib-dynload/resource.*.so " | 198 | FILES_${PN}-resource="${libdir}/python3.5/lib-dynload/resource.*.so " |
199 | 199 | ||
200 | SUMMARY_${PN}-shell="Python shell-like functionality" | 200 | SUMMARY_${PN}-shell="Python shell-like functionality" |
201 | RDEPENDS_${PN}-shell="${PN}-core ${PN}-re" | 201 | RDEPENDS_${PN}-shell="${PN}-core ${PN}-re" |
202 | FILES_${PN}-shell="${libdir}/python3.4/cmd.* ${libdir}/python3.4/commands.* ${libdir}/python3.4/dircache.* ${libdir}/python3.4/fnmatch.* ${libdir}/python3.4/glob.* ${libdir}/python3.4/popen2.* ${libdir}/python3.4/shlex.* ${libdir}/python3.4/shutil.* " | 202 | FILES_${PN}-shell="${libdir}/python3.5/cmd.* ${libdir}/python3.5/commands.* ${libdir}/python3.5/dircache.* ${libdir}/python3.5/fnmatch.* ${libdir}/python3.5/glob.* ${libdir}/python3.5/popen2.* ${libdir}/python3.5/shlex.* ${libdir}/python3.5/shutil.* " |
203 | 203 | ||
204 | SUMMARY_${PN}-smtpd="Python Simple Mail Transport Daemon" | 204 | SUMMARY_${PN}-smtpd="Python Simple Mail Transport Daemon" |
205 | RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime" | 205 | RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime" |
206 | FILES_${PN}-smtpd="${bindir}/smtpd.* ${libdir}/python3.4/smtpd.* " | 206 | FILES_${PN}-smtpd="${bindir}/smtpd.* ${libdir}/python3.5/smtpd.* " |
207 | 207 | ||
208 | SUMMARY_${PN}-sqlite3="Python Sqlite3 database support" | 208 | SUMMARY_${PN}-sqlite3="Python Sqlite3 database support" |
209 | RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading" | 209 | RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading" |
210 | FILES_${PN}-sqlite3="${libdir}/python3.4/lib-dynload/_sqlite3.*.so ${libdir}/python3.4/sqlite3/dbapi2.* ${libdir}/python3.4/sqlite3/__init__.* ${libdir}/python3.4/sqlite3/dump.* " | 210 | FILES_${PN}-sqlite3="${libdir}/python3.5/lib-dynload/_sqlite3.*.so ${libdir}/python3.5/sqlite3/dbapi2.* ${libdir}/python3.5/sqlite3/__init__.* ${libdir}/python3.5/sqlite3/dump.* " |
211 | 211 | ||
212 | SUMMARY_${PN}-sqlite3-tests="Python Sqlite3 database support tests" | 212 | SUMMARY_${PN}-sqlite3-tests="Python Sqlite3 database support tests" |
213 | RDEPENDS_${PN}-sqlite3-tests="${PN}-core ${PN}-sqlite3" | 213 | RDEPENDS_${PN}-sqlite3-tests="${PN}-core ${PN}-sqlite3" |
214 | FILES_${PN}-sqlite3-tests="${libdir}/python3.4/sqlite3/test " | 214 | FILES_${PN}-sqlite3-tests="${libdir}/python3.5/sqlite3/test " |
215 | 215 | ||
216 | SUMMARY_${PN}-stringold="Python string APIs [deprecated]" | 216 | SUMMARY_${PN}-stringold="Python string APIs [deprecated]" |
217 | RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re" | 217 | RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re" |
218 | FILES_${PN}-stringold="${libdir}/python3.4/lib-dynload/strop.*.so ${libdir}/python3.4/string.* ${libdir}/python3.4/stringold.* " | 218 | FILES_${PN}-stringold="${libdir}/python3.5/lib-dynload/strop.*.so ${libdir}/python3.5/string.* ${libdir}/python3.5/stringold.* " |
219 | 219 | ||
220 | SUMMARY_${PN}-subprocess="Python subprocess support" | 220 | SUMMARY_${PN}-subprocess="Python subprocess support" |
221 | RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle" | 221 | RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle" |
222 | FILES_${PN}-subprocess="${libdir}/python3.4/subprocess.* " | 222 | FILES_${PN}-subprocess="${libdir}/python3.5/subprocess.* " |
223 | 223 | ||
224 | SUMMARY_${PN}-syslog="Python syslog interface" | 224 | SUMMARY_${PN}-syslog="Python syslog interface" |
225 | RDEPENDS_${PN}-syslog="${PN}-core" | 225 | RDEPENDS_${PN}-syslog="${PN}-core" |
226 | FILES_${PN}-syslog="${libdir}/python3.4/lib-dynload/syslog.*.so " | 226 | FILES_${PN}-syslog="${libdir}/python3.5/lib-dynload/syslog.*.so " |
227 | 227 | ||
228 | SUMMARY_${PN}-terminal="Python terminal controlling support" | 228 | SUMMARY_${PN}-terminal="Python terminal controlling support" |
229 | RDEPENDS_${PN}-terminal="${PN}-core ${PN}-io" | 229 | RDEPENDS_${PN}-terminal="${PN}-core ${PN}-io" |
230 | FILES_${PN}-terminal="${libdir}/python3.4/pty.* ${libdir}/python3.4/tty.* " | 230 | FILES_${PN}-terminal="${libdir}/python3.5/pty.* ${libdir}/python3.5/tty.* " |
231 | 231 | ||
232 | SUMMARY_${PN}-tests="Python tests" | 232 | SUMMARY_${PN}-tests="Python tests" |
233 | RDEPENDS_${PN}-tests="${PN}-core" | 233 | RDEPENDS_${PN}-tests="${PN}-core" |
234 | FILES_${PN}-tests="${libdir}/python3.4/test " | 234 | FILES_${PN}-tests="${libdir}/python3.5/test " |
235 | 235 | ||
236 | SUMMARY_${PN}-textutils="Python option parsing, text wrapping and CSV support" | 236 | SUMMARY_${PN}-textutils="Python option parsing, text wrapping and CSV support" |
237 | RDEPENDS_${PN}-textutils="${PN}-core ${PN}-io ${PN}-re ${PN}-stringold" | 237 | RDEPENDS_${PN}-textutils="${PN}-core ${PN}-io ${PN}-re ${PN}-stringold" |
238 | FILES_${PN}-textutils="${libdir}/python3.4/lib-dynload/_csv.*.so ${libdir}/python3.4/csv.* ${libdir}/python3.4/optparse.* ${libdir}/python3.4/textwrap.* " | 238 | FILES_${PN}-textutils="${libdir}/python3.5/lib-dynload/_csv.*.so ${libdir}/python3.5/csv.* ${libdir}/python3.5/optparse.* ${libdir}/python3.5/textwrap.* " |
239 | 239 | ||
240 | SUMMARY_${PN}-threading="Python threading & synchronization support" | 240 | SUMMARY_${PN}-threading="Python threading & synchronization support" |
241 | RDEPENDS_${PN}-threading="${PN}-core ${PN}-lang" | 241 | RDEPENDS_${PN}-threading="${PN}-core ${PN}-lang" |
242 | FILES_${PN}-threading="${libdir}/python3.4/_threading_local.* ${libdir}/python3.4/dummy_thread.* ${libdir}/python3.4/dummy_threading.* ${libdir}/python3.4/mutex.* ${libdir}/python3.4/threading.* ${libdir}/python3.4/Queue.* " | 242 | FILES_${PN}-threading="${libdir}/python3.5/_threading_local.* ${libdir}/python3.5/dummy_thread.* ${libdir}/python3.5/dummy_threading.* ${libdir}/python3.5/mutex.* ${libdir}/python3.5/threading.* ${libdir}/python3.5/Queue.* " |
243 | 243 | ||
244 | SUMMARY_${PN}-tkinter="Python Tcl/Tk bindings" | 244 | SUMMARY_${PN}-tkinter="Python Tcl/Tk bindings" |
245 | RDEPENDS_${PN}-tkinter="${PN}-core" | 245 | RDEPENDS_${PN}-tkinter="${PN}-core" |
246 | FILES_${PN}-tkinter="${libdir}/python3.4/lib-dynload/_tkinter.*.so ${libdir}/python3.4/lib-tk ${libdir}/python3.4/tkinter " | 246 | FILES_${PN}-tkinter="${libdir}/python3.5/lib-dynload/_tkinter.*.so ${libdir}/python3.5/lib-tk ${libdir}/python3.5/tkinter " |
247 | 247 | ||
248 | SUMMARY_${PN}-unittest="Python unit testing framework" | 248 | SUMMARY_${PN}-unittest="Python unit testing framework" |
249 | RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang ${PN}-io ${PN}-difflib ${PN}-pprint ${PN}-shell" | 249 | RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang ${PN}-io ${PN}-difflib ${PN}-pprint ${PN}-shell" |
250 | FILES_${PN}-unittest="${libdir}/python3.4/unittest/ " | 250 | FILES_${PN}-unittest="${libdir}/python3.5/unittest/ " |
251 | 251 | ||
252 | SUMMARY_${PN}-unixadmin="Python Unix administration support" | 252 | SUMMARY_${PN}-unixadmin="Python Unix administration support" |
253 | RDEPENDS_${PN}-unixadmin="${PN}-core" | 253 | RDEPENDS_${PN}-unixadmin="${PN}-core" |
254 | FILES_${PN}-unixadmin="${libdir}/python3.4/lib-dynload/nis.*.so ${libdir}/python3.4/lib-dynload/grp.*.so ${libdir}/python3.4/lib-dynload/pwd.*.so ${libdir}/python3.4/getpass.* " | 254 | FILES_${PN}-unixadmin="${libdir}/python3.5/lib-dynload/nis.*.so ${libdir}/python3.5/lib-dynload/grp.*.so ${libdir}/python3.5/lib-dynload/pwd.*.so ${libdir}/python3.5/getpass.* " |
255 | 255 | ||
256 | SUMMARY_${PN}-xml="Python basic XML support" | 256 | SUMMARY_${PN}-xml="Python basic XML support" |
257 | RDEPENDS_${PN}-xml="${PN}-core ${PN}-elementtree ${PN}-re" | 257 | RDEPENDS_${PN}-xml="${PN}-core ${PN}-elementtree ${PN}-re" |
258 | FILES_${PN}-xml="${libdir}/python3.4/lib-dynload/pyexpat.*.so ${libdir}/python3.4/xml ${libdir}/python3.4/xmllib.* " | 258 | FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/pyexpat.*.so ${libdir}/python3.5/xml ${libdir}/python3.5/xmllib.* " |
259 | 259 | ||
260 | SUMMARY_${PN}-xmlrpc="Python XML-RPC support" | 260 | SUMMARY_${PN}-xmlrpc="Python XML-RPC support" |
261 | RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" | 261 | RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" |
262 | FILES_${PN}-xmlrpc="${libdir}/python3.4/xmlrpclib.* ${libdir}/python3.4/SimpleXMLRPCServer.* ${libdir}/python3.4/DocXMLRPCServer.* ${libdir}/python3.4/xmlrpc " | 262 | FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc " |
263 | 263 | ||
264 | SUMMARY_${PN}-modules="All Python modules" | 264 | SUMMARY_${PN}-modules="All Python modules" |
265 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc " | 265 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc " |
diff --git a/meta/recipes-devtools/python/python3-native_3.4.3.bb b/meta/recipes-devtools/python/python3-native_3.5.0.bb index 464ff05802..198f93d1bf 100644 --- a/meta/recipes-devtools/python/python3-native_3.4.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require recipes-devtools/python/python.inc | 1 | require recipes-devtools/python/python.inc |
2 | 2 | ||
3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.0" |
4 | PYTHON_MAJMIN = "3.4" | 4 | PYTHON_MAJMIN = "3.5" |
5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
6 | DISTRO_SRC_URI_linuxstdbase = "" | 6 | DISTRO_SRC_URI_linuxstdbase = "" |
7 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | 7 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ |
@@ -22,13 +22,12 @@ file://shutil-follow-symlink-fix.patch \ | |||
22 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 22 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |
23 | file://sysroot-include-headers.patch \ | 23 | file://sysroot-include-headers.patch \ |
24 | file://unixccompiler.patch \ | 24 | file://unixccompiler.patch \ |
25 | file://makerace.patch \ | ||
26 | ${DISTRO_SRC_URI} \ | 25 | ${DISTRO_SRC_URI} \ |
27 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ | 26 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ |
28 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ | 27 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ |
29 | " | 28 | " |
30 | SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5" | 29 | SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171" |
31 | SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8" | 30 | SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91" |
32 | 31 | ||
33 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" | 32 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" |
34 | 33 | ||
diff --git a/meta/recipes-devtools/python/python3-pip_6.1.1.bb b/meta/recipes-devtools/python/python3-pip_6.1.1.bb index 7bfc30e2ae..7014bc0187 100644 --- a/meta/recipes-devtools/python/python3-pip_6.1.1.bb +++ b/meta/recipes-devtools/python/python3-pip_6.1.1.bb | |||
@@ -26,7 +26,13 @@ do_install_prepend() { | |||
26 | # Use setuptools site.py instead, avoid shared state issue | 26 | # Use setuptools site.py instead, avoid shared state issue |
27 | do_install_append() { | 27 | do_install_append() { |
28 | rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/site.py | 28 | rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/site.py |
29 | rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/__pycache__/site.cpython-34.pyc | 29 | rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/__pycache__/site.cpython-*.pyc |
30 | |||
31 | # Install as pip3 and leave pip2 as default | ||
32 | rm ${D}/${bindir}/pip | ||
33 | |||
34 | # Installed eggs need to be passed directly to the interpreter via a pth file | ||
35 | echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth | ||
30 | } | 36 | } |
31 | 37 | ||
32 | RDEPENDS_${PN} = "\ | 38 | RDEPENDS_${PN} = "\ |
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch index 2506a590c0..a3ffe3bea8 100644 --- a/meta/recipes-devtools/python/python3/000-cross-compile.patch +++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch | |||
@@ -9,9 +9,11 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
9 | Makefile.pre.in | 25 +++++++++++++------------ | 9 | Makefile.pre.in | 25 +++++++++++++------------ |
10 | 1 file changed, 13 insertions(+), 12 deletions(-) | 10 | 1 file changed, 13 insertions(+), 12 deletions(-) |
11 | 11 | ||
12 | --- a/Makefile.pre.in | 12 | Index: Python-3.5.0/Makefile.pre.in |
13 | +++ b/Makefile.pre.in | 13 | =================================================================== |
14 | @@ -193,6 +193,7 @@ LIBOBJS= @LIBOBJS@ | 14 | --- Python-3.5.0.orig/Makefile.pre.in |
15 | +++ Python-3.5.0/Makefile.pre.in | ||
16 | @@ -215,6 +215,7 @@ LIBOBJS= @LIBOBJS@ | ||
15 | 17 | ||
16 | PYTHON= python$(EXE) | 18 | PYTHON= python$(EXE) |
17 | BUILDPYTHON= python$(BUILDEXE) | 19 | BUILDPYTHON= python$(BUILDEXE) |
@@ -19,7 +21,7 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
19 | 21 | ||
20 | PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ | 22 | PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ |
21 | _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ | 23 | _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ |
22 | @@ -239,6 +240,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ | 24 | @@ -272,6 +273,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ |
23 | ########################################################################## | 25 | ########################################################################## |
24 | # Parser | 26 | # Parser |
25 | PGEN= Parser/pgen$(EXE) | 27 | PGEN= Parser/pgen$(EXE) |
@@ -27,7 +29,7 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
27 | 29 | ||
28 | PSRCS= \ | 30 | PSRCS= \ |
29 | Parser/acceler.c \ | 31 | Parser/acceler.c \ |
30 | @@ -451,7 +453,7 @@ build_all_generate_profile: | 32 | @@ -494,7 +496,7 @@ build_all_generate_profile: |
31 | 33 | ||
32 | run_profile_task: | 34 | run_profile_task: |
33 | : # FIXME: can't run for a cross build | 35 | : # FIXME: can't run for a cross build |
@@ -35,17 +37,17 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
35 | + $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) | 37 | + $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) |
36 | 38 | ||
37 | build_all_use_profile: | 39 | build_all_use_profile: |
38 | $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction" | 40 | $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction" |
39 | @@ -640,7 +642,7 @@ $(IO_OBJS): $(IO_H) | 41 | @@ -764,7 +766,7 @@ $(IO_OBJS): $(IO_H) |
40 | $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) | 42 | |
43 | $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) | ||
41 | @$(MKDIR_P) Include | 44 | @$(MKDIR_P) Include |
42 | $(MAKE) $(PGEN) | ||
43 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 45 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
44 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 46 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
45 | $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) | 47 | $(GRAMMAR_C): $(GRAMMAR_H) |
46 | $(MAKE) $(GRAMMAR_H) | ||
47 | touch $(GRAMMAR_C) | 48 | touch $(GRAMMAR_C) |
48 | @@ -820,7 +822,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho | 49 | |
50 | @@ -953,7 +955,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth | ||
49 | ###################################################################### | 51 | ###################################################################### |
50 | 52 | ||
51 | TESTOPTS= $(EXTRATESTOPTS) | 53 | TESTOPTS= $(EXTRATESTOPTS) |
@@ -54,7 +56,7 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
54 | TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py | 56 | TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py |
55 | TESTTIMEOUT= 3600 | 57 | TESTTIMEOUT= 3600 |
56 | 58 | ||
57 | @@ -1229,7 +1231,7 @@ frameworkinstallstructure: $(LDLIBRARY) | 59 | @@ -1440,7 +1442,7 @@ frameworkinstallstructure: $(LDLIBRARY) |
58 | fi; \ | 60 | fi; \ |
59 | done | 61 | done |
60 | $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers | 62 | $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers |
@@ -63,7 +65,7 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
63 | $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current | 65 | $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current |
64 | $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) | 66 | $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) |
65 | $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers | 67 | $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers |
66 | @@ -1288,7 +1290,7 @@ config.status: $(srcdir)/configure | 68 | @@ -1506,7 +1508,7 @@ config.status: $(srcdir)/configure |
67 | 69 | ||
68 | # Run reindent on the library | 70 | # Run reindent on the library |
69 | reindent: | 71 | reindent: |
@@ -72,12 +74,12 @@ Upstream-Status: Inappropriate[Configuration Specific] | |||
72 | 74 | ||
73 | # Rerun configure with the same options as it was run last time, | 75 | # Rerun configure with the same options as it was run last time, |
74 | # provided the config.status script exists | 76 | # provided the config.status script exists |
75 | @@ -1414,7 +1416,7 @@ funny: | 77 | @@ -1639,7 +1641,7 @@ funny: |
76 | 78 | ||
77 | # Perform some verification checks on any modified files. | 79 | # Perform some verification checks on any modified files. |
78 | patchcheck: | 80 | patchcheck: all |
79 | - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | 81 | - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py |
80 | + $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | 82 | + $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py |
81 | 83 | ||
82 | # Dependencies | 84 | # Dependencies |
83 | 85 | ||
diff --git a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch b/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch index 03ef286941..819ba69eda 100644 --- a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch +++ b/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch | |||
@@ -8,9 +8,11 @@ Upstream-Status: Inappropriate[Embedded-Specific] | |||
8 | Makefile.pre.in | 16 ---------------- | 8 | Makefile.pre.in | 16 ---------------- |
9 | 1 file changed, 16 deletions(-) | 9 | 1 file changed, 16 deletions(-) |
10 | 10 | ||
11 | --- a/Makefile.pre.in | 11 | Index: Python-3.5.0/Makefile.pre.in |
12 | +++ b/Makefile.pre.in | 12 | =================================================================== |
13 | @@ -1078,24 +1078,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL | 13 | --- Python-3.5.0.orig/Makefile.pre.in |
14 | +++ Python-3.5.0/Makefile.pre.in | ||
15 | @@ -1262,33 +1262,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL | ||
14 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ | 16 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ |
15 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | 17 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ |
16 | fi | 18 | fi |
@@ -24,7 +26,12 @@ Upstream-Status: Inappropriate[Embedded-Specific] | |||
24 | - -d $(LIBDEST) -f \ | 26 | - -d $(LIBDEST) -f \ |
25 | - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 27 | - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
26 | - $(DESTDIR)$(LIBDEST) | 28 | - $(DESTDIR)$(LIBDEST) |
27 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 29 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
30 | - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
31 | - -d $(LIBDEST) -f \ | ||
32 | - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
33 | - $(DESTDIR)$(LIBDEST) | ||
34 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
28 | - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ | 35 | - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ |
29 | - -d $(LIBDEST)/site-packages -f \ | 36 | - -d $(LIBDEST)/site-packages -f \ |
30 | - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 37 | - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
@@ -32,6 +39,10 @@ Upstream-Status: Inappropriate[Embedded-Specific] | |||
32 | - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 39 | - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
33 | - -d $(LIBDEST)/site-packages -f \ | 40 | - -d $(LIBDEST)/site-packages -f \ |
34 | - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 41 | - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
42 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
43 | - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
44 | - -d $(LIBDEST)/site-packages -f \ | ||
45 | - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
35 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 46 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
36 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt | 47 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt |
37 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 48 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
diff --git a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch b/meta/recipes-devtools/python/python3/04-default-is-optimized.patch index 3b8f264a58..4b8a7e56bc 100644 --- a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch +++ b/meta/recipes-devtools/python/python3/04-default-is-optimized.patch | |||
@@ -12,24 +12,11 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | |||
12 | Rebased for 3.4.2 02/2015 | 12 | Rebased for 3.4.2 02/2015 |
13 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 13 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
14 | 14 | ||
15 | Index: Python-3.4.2/Python/compile.c | 15 | Index: Python-3.5.0/Modules/main.c |
16 | =================================================================== | 16 | =================================================================== |
17 | --- Python-3.4.2.orig/Python/compile.c | 17 | --- Python-3.5.0.orig/Modules/main.c |
18 | +++ Python-3.4.2/Python/compile.c | 18 | +++ Python-3.5.0/Modules/main.c |
19 | @@ -30,7 +30,7 @@ | 19 | @@ -37,7 +37,7 @@ static wchar_t **orig_argv; |
20 | #include "symtable.h" | ||
21 | #include "opcode.h" | ||
22 | |||
23 | -int Py_OptimizeFlag = 0; | ||
24 | +int Py_OptimizeFlag = 1; | ||
25 | |||
26 | #define DEFAULT_BLOCK_SIZE 16 | ||
27 | #define DEFAULT_BLOCKS 8 | ||
28 | Index: Python-3.4.2/Modules/main.c | ||
29 | =================================================================== | ||
30 | --- Python-3.4.2.orig/Modules/main.c | ||
31 | +++ Python-3.4.2/Modules/main.c | ||
32 | @@ -38,7 +38,7 @@ static wchar_t **orig_argv; | ||
33 | static int orig_argc; | 20 | static int orig_argc; |
34 | 21 | ||
35 | /* command line options */ | 22 | /* command line options */ |
@@ -38,7 +25,7 @@ Index: Python-3.4.2/Modules/main.c | |||
38 | 25 | ||
39 | #define PROGRAM_OPTS BASE_OPTS | 26 | #define PROGRAM_OPTS BASE_OPTS |
40 | 27 | ||
41 | @@ -64,6 +64,7 @@ static char *usage_2 = "\ | 28 | @@ -63,6 +63,7 @@ static char *usage_2 = "\ |
42 | -m mod : run library module as a script (terminates option list)\n\ | 29 | -m mod : run library module as a script (terminates option list)\n\ |
43 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ | 30 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ |
44 | -OO : remove doc-strings in addition to the -O optimizations\n\ | 31 | -OO : remove doc-strings in addition to the -O optimizations\n\ |
@@ -46,7 +33,7 @@ Index: Python-3.4.2/Modules/main.c | |||
46 | -q : don't print version and copyright messages on interactive startup\n\ | 33 | -q : don't print version and copyright messages on interactive startup\n\ |
47 | -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ | 34 | -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ |
48 | -S : don't imply 'import site' on initialization\n\ | 35 | -S : don't imply 'import site' on initialization\n\ |
49 | @@ -418,8 +419,8 @@ Py_Main(int argc, wchar_t **argv) | 36 | @@ -419,8 +420,8 @@ Py_Main(int argc, wchar_t **argv) |
50 | 37 | ||
51 | /* case 'J': reserved for Jython */ | 38 | /* case 'J': reserved for Jython */ |
52 | 39 | ||
@@ -57,3 +44,16 @@ Index: Python-3.4.2/Modules/main.c | |||
57 | break; | 44 | break; |
58 | 45 | ||
59 | case 'B': | 46 | case 'B': |
47 | Index: Python-3.5.0/Python/pylifecycle.c | ||
48 | =================================================================== | ||
49 | --- Python-3.5.0.orig/Python/pylifecycle.c | ||
50 | +++ Python-3.5.0/Python/pylifecycle.c | ||
51 | @@ -80,7 +80,7 @@ int Py_VerboseFlag; /* Needed by import. | ||
52 | int Py_QuietFlag; /* Needed by sysmodule.c */ | ||
53 | int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */ | ||
54 | int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */ | ||
55 | -int Py_OptimizeFlag = 0; /* Needed by compile.c */ | ||
56 | +int Py_OptimizeFlag = 1; /* Needed by compile.c */ | ||
57 | int Py_NoSiteFlag; /* Suppress 'import site' */ | ||
58 | int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ | ||
59 | int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ | ||
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch deleted file mode 100644 index d8a68923a8..0000000000 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | There is a race due to the execution of make inside the makefile: | ||
2 | |||
3 | | gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c | ||
4 | | gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Parser/pgen.o Parser/pgen.c| gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c | ||
5 | | gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c | ||
6 | | Objects/obmalloc.o: file not recognized: File truncated | ||
7 | | collect2: error: ld returned 1 exit status | ||
8 | | make[1]: *** [Parser/pgen] Error 1 | ||
9 | |||
10 | The easiest way to avoid this is to list the dependencies explictly. | ||
11 | |||
12 | RP 28/2/2014 | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Index: Python-3.3.3/Makefile.pre.in | ||
17 | =================================================================== | ||
18 | --- Python-3.3.3.orig/Makefile.pre.in 2014-02-27 14:04:38.268339533 +0000 | ||
19 | +++ Python-3.3.3/Makefile.pre.in 2014-02-28 10:40:59.166361125 +0000 | ||
20 | @@ -676,7 +676,7 @@ | ||
21 | |||
22 | $(IO_OBJS): $(IO_H) | ||
23 | |||
24 | -$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) | ||
25 | +$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) | ||
26 | @$(MKDIR_P) Include | ||
27 | $(MAKE) $(PGEN) | ||
28 | $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | ||
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch index b3e986089e..44ec424cd2 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch | |||
@@ -7,23 +7,24 @@ get the sys.lib from python itself and do not use hardcoded value of 'lib' | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 8 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
9 | 9 | ||
10 | Index: Python-3.4.2/Include/pythonrun.h | 10 | Index: Python-3.5.0/Include/pythonrun.h |
11 | =================================================================== | 11 | =================================================================== |
12 | --- Python-3.4.2.orig/Include/pythonrun.h | 12 | --- Python-3.5.0.orig/Include/pythonrun.h |
13 | +++ Python-3.4.2/Include/pythonrun.h | 13 | +++ Python-3.5.0/Include/pythonrun.h |
14 | @@ -220,6 +220,8 @@ int _Py_CheckPython3(); | 14 | @@ -23,6 +23,9 @@ typedef struct { |
15 | /* In their own files */ | 15 | } PyCompilerFlags; |
16 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 16 | #endif |
17 | PyAPI_FUNC(const char *) Py_GetPlatform(void); | 17 | |
18 | +PyAPI_FUNC(const char *) Py_GetArch(void); | 18 | +PyAPI_FUNC(const char *) Py_GetArch(void); |
19 | +PyAPI_FUNC(const char *) Py_GetLib(void); | 19 | +PyAPI_FUNC(const char *) Py_GetLib(void); |
20 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 20 | + |
21 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 21 | #ifndef Py_LIMITED_API |
22 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 22 | PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); |
23 | Index: Python-3.4.2/Lib/distutils/command/install.py | 23 | PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); |
24 | Index: Python-3.5.0/Lib/distutils/command/install.py | ||
24 | =================================================================== | 25 | =================================================================== |
25 | --- Python-3.4.2.orig/Lib/distutils/command/install.py | 26 | --- Python-3.5.0.orig/Lib/distutils/command/install.py |
26 | +++ Python-3.4.2/Lib/distutils/command/install.py | 27 | +++ Python-3.5.0/Lib/distutils/command/install.py |
27 | @@ -19,6 +19,8 @@ from site import USER_BASE | 28 | @@ -19,6 +19,8 @@ from site import USER_BASE |
28 | from site import USER_SITE | 29 | from site import USER_SITE |
29 | HAS_USER_SITE = True | 30 | HAS_USER_SITE = True |
@@ -42,11 +43,11 @@ Index: Python-3.4.2/Lib/distutils/command/install.py | |||
42 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', | 43 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', |
43 | 'scripts': '$base/bin', | 44 | 'scripts': '$base/bin', |
44 | 'data' : '$base', | 45 | 'data' : '$base', |
45 | Index: Python-3.4.2/Lib/pydoc.py | 46 | Index: Python-3.5.0/Lib/pydoc.py |
46 | =================================================================== | 47 | =================================================================== |
47 | --- Python-3.4.2.orig/Lib/pydoc.py | 48 | --- Python-3.5.0.orig/Lib/pydoc.py |
48 | +++ Python-3.4.2/Lib/pydoc.py | 49 | +++ Python-3.5.0/Lib/pydoc.py |
49 | @@ -394,7 +394,7 @@ class Doc: | 50 | @@ -393,7 +393,7 @@ class Doc: |
50 | 51 | ||
51 | docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) | 52 | docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) |
52 | 53 | ||
@@ -55,11 +56,11 @@ Index: Python-3.4.2/Lib/pydoc.py | |||
55 | "python%d.%d" % sys.version_info[:2]) | 56 | "python%d.%d" % sys.version_info[:2]) |
56 | if (isinstance(object, type(os)) and | 57 | if (isinstance(object, type(os)) and |
57 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 58 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
58 | Index: Python-3.4.2/Lib/trace.py | 59 | Index: Python-3.5.0/Lib/trace.py |
59 | =================================================================== | 60 | =================================================================== |
60 | --- Python-3.4.2.orig/Lib/trace.py | 61 | --- Python-3.5.0.orig/Lib/trace.py |
61 | +++ Python-3.4.2/Lib/trace.py | 62 | +++ Python-3.5.0/Lib/trace.py |
62 | @@ -751,10 +751,10 @@ def main(argv=None): | 63 | @@ -749,10 +749,10 @@ def main(argv=None): |
63 | # should I also call expanduser? (after all, could use $HOME) | 64 | # should I also call expanduser? (after all, could use $HOME) |
64 | 65 | ||
65 | s = s.replace("$prefix", | 66 | s = s.replace("$prefix", |
@@ -72,10 +73,10 @@ Index: Python-3.4.2/Lib/trace.py | |||
72 | "python" + sys.version[:3])) | 73 | "python" + sys.version[:3])) |
73 | s = os.path.normpath(s) | 74 | s = os.path.normpath(s) |
74 | ignore_dirs.append(s) | 75 | ignore_dirs.append(s) |
75 | Index: Python-3.4.2/Makefile.pre.in | 76 | Index: Python-3.5.0/Makefile.pre.in |
76 | =================================================================== | 77 | =================================================================== |
77 | --- Python-3.4.2.orig/Makefile.pre.in | 78 | --- Python-3.5.0.orig/Makefile.pre.in |
78 | +++ Python-3.4.2/Makefile.pre.in | 79 | +++ Python-3.5.0/Makefile.pre.in |
79 | @@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS | 80 | @@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS |
80 | 81 | ||
81 | # Machine-dependent subdirectories | 82 | # Machine-dependent subdirectories |
@@ -94,15 +95,15 @@ Index: Python-3.4.2/Makefile.pre.in | |||
94 | ABIFLAGS= @ABIFLAGS@ | 95 | ABIFLAGS= @ABIFLAGS@ |
95 | 96 | ||
96 | # Detailed destination directories | 97 | # Detailed destination directories |
97 | @@ -712,6 +714,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 98 | @@ -729,6 +731,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
98 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 99 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
99 | -DVERSION='"$(VERSION)"' \ | 100 | -DVERSION='"$(VERSION)"' \ |
100 | -DVPATH='"$(VPATH)"' \ | 101 | -DVPATH='"$(VPATH)"' \ |
101 | + -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \ | 102 | + -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \ |
102 | -o $@ $(srcdir)/Modules/getpath.c | 103 | -o $@ $(srcdir)/Modules/getpath.c |
103 | 104 | ||
104 | Modules/python.o: $(srcdir)/Modules/python.c | 105 | Programs/python.o: $(srcdir)/Programs/python.c |
105 | @@ -780,7 +783,7 @@ $(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN | 106 | @@ -798,7 +801,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O |
106 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) | 107 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
107 | 108 | ||
108 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 109 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -111,10 +112,10 @@ Index: Python-3.4.2/Makefile.pre.in | |||
111 | 112 | ||
112 | Python/importdl.o: $(srcdir)/Python/importdl.c | 113 | Python/importdl.o: $(srcdir)/Python/importdl.c |
113 | $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 114 | $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
114 | Index: Python-3.4.2/Modules/getpath.c | 115 | Index: Python-3.5.0/Modules/getpath.c |
115 | =================================================================== | 116 | =================================================================== |
116 | --- Python-3.4.2.orig/Modules/getpath.c | 117 | --- Python-3.5.0.orig/Modules/getpath.c |
117 | +++ Python-3.4.2/Modules/getpath.c | 118 | +++ Python-3.5.0/Modules/getpath.c |
118 | @@ -117,9 +117,11 @@ | 119 | @@ -117,9 +117,11 @@ |
119 | #define EXEC_PREFIX PREFIX | 120 | #define EXEC_PREFIX PREFIX |
120 | #endif | 121 | #endif |
@@ -135,12 +136,12 @@ Index: Python-3.4.2/Modules/getpath.c | |||
135 | static wchar_t *module_search_path = NULL; | 136 | static wchar_t *module_search_path = NULL; |
136 | +static wchar_t *lib_python = L"" LIB_PYTHON; | 137 | +static wchar_t *lib_python = L"" LIB_PYTHON; |
137 | 138 | ||
138 | static void | 139 | /* Get file status. Encode the path to the locale encoding. */ |
139 | reduce(wchar_t *dir) | 140 | |
140 | Index: Python-3.4.2/Python/getplatform.c | 141 | Index: Python-3.5.0/Python/getplatform.c |
141 | =================================================================== | 142 | =================================================================== |
142 | --- Python-3.4.2.orig/Python/getplatform.c | 143 | --- Python-3.5.0.orig/Python/getplatform.c |
143 | +++ Python-3.4.2/Python/getplatform.c | 144 | +++ Python-3.5.0/Python/getplatform.c |
144 | @@ -10,3 +10,23 @@ Py_GetPlatform(void) | 145 | @@ -10,3 +10,23 @@ Py_GetPlatform(void) |
145 | { | 146 | { |
146 | return PLATFORM; | 147 | return PLATFORM; |
@@ -165,11 +166,11 @@ Index: Python-3.4.2/Python/getplatform.c | |||
165 | +{ | 166 | +{ |
166 | + return LIB; | 167 | + return LIB; |
167 | +} | 168 | +} |
168 | Index: Python-3.4.2/Python/sysmodule.c | 169 | Index: Python-3.5.0/Python/sysmodule.c |
169 | =================================================================== | 170 | =================================================================== |
170 | --- Python-3.4.2.orig/Python/sysmodule.c | 171 | --- Python-3.5.0.orig/Python/sysmodule.c |
171 | +++ Python-3.4.2/Python/sysmodule.c | 172 | +++ Python-3.5.0/Python/sysmodule.c |
172 | @@ -1697,6 +1697,10 @@ _PySys_Init(void) | 173 | @@ -1767,6 +1767,10 @@ _PySys_Init(void) |
173 | PyUnicode_FromString(Py_GetCopyright())); | 174 | PyUnicode_FromString(Py_GetCopyright())); |
174 | SET_SYS_FROM_STRING("platform", | 175 | SET_SYS_FROM_STRING("platform", |
175 | PyUnicode_FromString(Py_GetPlatform())); | 176 | PyUnicode_FromString(Py_GetPlatform())); |
@@ -180,11 +181,11 @@ Index: Python-3.4.2/Python/sysmodule.c | |||
180 | SET_SYS_FROM_STRING("executable", | 181 | SET_SYS_FROM_STRING("executable", |
181 | PyUnicode_FromWideChar( | 182 | PyUnicode_FromWideChar( |
182 | Py_GetProgramFullPath(), -1)); | 183 | Py_GetProgramFullPath(), -1)); |
183 | Index: Python-3.4.2/setup.py | 184 | Index: Python-3.5.0/setup.py |
184 | =================================================================== | 185 | =================================================================== |
185 | --- Python-3.4.2.orig/setup.py | 186 | --- Python-3.5.0.orig/setup.py |
186 | +++ Python-3.4.2/setup.py | 187 | +++ Python-3.5.0/setup.py |
187 | @@ -454,7 +454,7 @@ class PyBuildExt(build_ext): | 188 | @@ -472,7 +472,7 @@ class PyBuildExt(build_ext): |
188 | # directories (i.e. '.' and 'Include') must be first. See issue | 189 | # directories (i.e. '.' and 'Include') must be first. See issue |
189 | # 10520. | 190 | # 10520. |
190 | if not cross_compiling: | 191 | if not cross_compiling: |
@@ -193,7 +194,7 @@ Index: Python-3.4.2/setup.py | |||
193 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | 194 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
194 | # only change this for cross builds for 3.3, issues on Mageia | 195 | # only change this for cross builds for 3.3, issues on Mageia |
195 | if cross_compiling: | 196 | if cross_compiling: |
196 | @@ -512,8 +512,7 @@ class PyBuildExt(build_ext): | 197 | @@ -530,8 +530,7 @@ class PyBuildExt(build_ext): |
197 | # be assumed that no additional -I,-L directives are needed. | 198 | # be assumed that no additional -I,-L directives are needed. |
198 | if not cross_compiling: | 199 | if not cross_compiling: |
199 | lib_dirs = self.compiler.library_dirs + [ | 200 | lib_dirs = self.compiler.library_dirs + [ |
@@ -203,7 +204,7 @@ Index: Python-3.4.2/setup.py | |||
203 | ] | 204 | ] |
204 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] | 205 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] |
205 | else: | 206 | else: |
206 | @@ -696,11 +695,11 @@ class PyBuildExt(build_ext): | 207 | @@ -716,11 +715,11 @@ class PyBuildExt(build_ext): |
207 | elif curses_library: | 208 | elif curses_library: |
208 | readline_libs.append(curses_library) | 209 | readline_libs.append(curses_library) |
209 | elif self.compiler.find_library_file(lib_dirs + | 210 | elif self.compiler.find_library_file(lib_dirs + |
@@ -217,10 +218,10 @@ Index: Python-3.4.2/setup.py | |||
217 | extra_link_args=readline_extra_link_args, | 218 | extra_link_args=readline_extra_link_args, |
218 | libraries=readline_libs) ) | 219 | libraries=readline_libs) ) |
219 | else: | 220 | else: |
220 | Index: Python-3.4.2/Lib/sysconfig.py | 221 | Index: Python-3.5.0/Lib/sysconfig.py |
221 | =================================================================== | 222 | =================================================================== |
222 | --- Python-3.4.2.orig/Lib/sysconfig.py | 223 | --- Python-3.5.0.orig/Lib/sysconfig.py |
223 | +++ Python-3.4.2/Lib/sysconfig.py | 224 | +++ Python-3.5.0/Lib/sysconfig.py |
224 | @@ -20,10 +20,10 @@ __all__ = [ | 225 | @@ -20,10 +20,10 @@ __all__ = [ |
225 | 226 | ||
226 | _INSTALL_SCHEMES = { | 227 | _INSTALL_SCHEMES = { |
@@ -263,13 +264,13 @@ Index: Python-3.4.2/Lib/sysconfig.py | |||
263 | 'include': '{userbase}/include/python{py_version_short}', | 264 | 'include': '{userbase}/include/python{py_version_short}', |
264 | 'scripts': '{userbase}/bin', | 265 | 'scripts': '{userbase}/bin', |
265 | 'data': '{userbase}', | 266 | 'data': '{userbase}', |
266 | Index: Python-3.4.2/configure.ac | 267 | Index: Python-3.5.0/configure.ac |
267 | =================================================================== | 268 | =================================================================== |
268 | --- Python-3.4.2.orig/configure.ac | 269 | --- Python-3.5.0.orig/configure.ac |
269 | +++ Python-3.4.2/configure.ac | 270 | +++ Python-3.5.0/configure.ac |
270 | @@ -791,6 +791,41 @@ esac | 271 | @@ -858,6 +858,41 @@ PLATDIR=plat-$MACHDEP |
271 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) | 272 | AC_SUBST(PLATDIR) |
272 | AC_SUBST(MULTIARCH) | 273 | AC_SUBST(PLATFORM_TRIPLET) |
273 | 274 | ||
274 | +AC_SUBST(ARCH) | 275 | +AC_SUBST(ARCH) |
275 | +AC_MSG_CHECKING(ARCH) | 276 | +AC_MSG_CHECKING(ARCH) |
@@ -307,32 +308,5 @@ Index: Python-3.4.2/configure.ac | |||
307 | +esac | 308 | +esac |
308 | +AC_MSG_RESULT($LIB) | 309 | +AC_MSG_RESULT($LIB) |
309 | 310 | ||
310 | AC_SUBST(LIBRARY) | 311 | AC_MSG_CHECKING([for -Wl,--no-as-needed]) |
311 | AC_MSG_CHECKING(LIBRARY) | 312 | save_LDFLAGS="$LDFLAGS" |
312 | Index: Python-3.4.2/Lib/site.py | ||
313 | =================================================================== | ||
314 | --- Python-3.4.2.orig/Lib/site.py | ||
315 | +++ Python-3.4.2/Lib/site.py | ||
316 | @@ -304,13 +304,19 @@ def getsitepackages(prefixes=None): | ||
317 | seen.add(prefix) | ||
318 | |||
319 | if os.sep == '/': | ||
320 | - sitepackages.append(os.path.join(prefix, "lib", | ||
321 | + sitepackages.append(os.path.join(prefix, sys.lib, | ||
322 | "python" + sys.version[:3], | ||
323 | "site-packages")) | ||
324 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) | ||
325 | + if sys.lib != "lib": | ||
326 | + sitepackages.append(os.path.join(prefix, "lib", | ||
327 | + "python" + sys.version[:3], | ||
328 | + "site-packages")) | ||
329 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) | ||
330 | + if sys.lib != "lib": | ||
331 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) | ||
332 | else: | ||
333 | sitepackages.append(prefix) | ||
334 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) | ||
335 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) | ||
336 | if sys.platform == "darwin": | ||
337 | # for framework builds *only* we add the standard Apple | ||
338 | # locations. | ||
diff --git a/meta/recipes-devtools/python/python3/use_packed_importlib.patch b/meta/recipes-devtools/python/python3/use_packed_importlib.patch new file mode 100644 index 0000000000..6c4b0cda9e --- /dev/null +++ b/meta/recipes-devtools/python/python3/use_packed_importlib.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | |||
2 | Upstream-Status: Inappropriate [embedded specific] | ||
3 | |||
4 | The binary _freeze_importlib is built and also used during build time to generate | ||
5 | importlib*.h files, this is impossible to do on a cross-compile environment, | ||
6 | this avoids executing the binary and forces it to use the packed importlib*.h files. | ||
7 | |||
8 | |||
9 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
10 | |||
11 | Index: Python-3.5.0/Makefile.pre.in | ||
12 | =================================================================== | ||
13 | --- Python-3.5.0.orig/Makefile.pre.in | ||
14 | +++ Python-3.5.0/Makefile.pre.in | ||
15 | @@ -700,12 +700,12 @@ Programs/_freeze_importlib.o: Programs/_ | ||
16 | Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) | ||
17 | $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | ||
18 | |||
19 | -Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib | ||
20 | - ./Programs/_freeze_importlib \ | ||
21 | +#Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib | ||
22 | +# ./Programs/_freeze_importlib \ | ||
23 | $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h | ||
24 | |||
25 | -Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib | ||
26 | - ./Programs/_freeze_importlib \ | ||
27 | +#Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib | ||
28 | +# ./Programs/_freeze_importlib \ | ||
29 | $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h | ||
30 | |||
31 | |||
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.5.0.bb index a33f10f01f..d0872be2b6 100644 --- a/meta/recipes-devtools/python/python3_3.4.3.bb +++ b/meta/recipes-devtools/python/python3_3.5.0.bb | |||
@@ -2,7 +2,7 @@ require recipes-devtools/python/python.inc | |||
2 | 2 | ||
3 | DEPENDS = "python3-native libffi bzip2 db gdbm openssl readline sqlite3 zlib virtual/libintl xz" | 3 | DEPENDS = "python3-native libffi bzip2 db gdbm openssl readline sqlite3 zlib virtual/libintl xz" |
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | PYTHON_MAJMIN = "3.4" | 5 | PYTHON_MAJMIN = "3.5" |
6 | PYTHON_BINABI= "${PYTHON_MAJMIN}m" | 6 | PYTHON_BINABI= "${PYTHON_MAJMIN}m" |
7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
8 | DISTRO_SRC_URI_linuxstdbase = "" | 8 | DISTRO_SRC_URI_linuxstdbase = "" |
@@ -17,7 +17,6 @@ file://110-enable-zlib.patch \ | |||
17 | file://130-readline-setup.patch \ | 17 | file://130-readline-setup.patch \ |
18 | file://150-fix-setupterm.patch \ | 18 | file://150-fix-setupterm.patch \ |
19 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 19 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |
20 | file://makerace.patch \ | ||
21 | ${DISTRO_SRC_URI} \ | 20 | ${DISTRO_SRC_URI} \ |
22 | " | 21 | " |
23 | 22 | ||
@@ -37,9 +36,10 @@ SRC_URI += "\ | |||
37 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ | 36 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ |
38 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ | 37 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ |
39 | file://setup.py-find-libraries-in-staging-dirs.patch \ | 38 | file://setup.py-find-libraries-in-staging-dirs.patch \ |
39 | file://use_packed_importlib.patch \ | ||
40 | " | 40 | " |
41 | SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5" | 41 | SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171" |
42 | SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8" | 42 | SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91" |
43 | 43 | ||
44 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" | 44 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" |
45 | 45 | ||