diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-02-27 12:49:22 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-07 13:40:33 +0100 |
commit | 19149e67e89f18f2001102ba714779175f3846e7 (patch) | |
tree | 5867964291c3565fd18f73673ea70a40bfabae73 /meta | |
parent | b2b59b14ecfe13ba794d92f97d1403d6503c7407 (diff) | |
download | poky-19149e67e89f18f2001102ba714779175f3846e7.tar.gz |
python3: Upgrade from 3.3.3 to 3.4.2
Modifies:
python3-native_3.3.3.bb -> python3-native_3.4.2.bb: Updates checksums, version, patches
and SRC_URIs to use xz format, LICENSE did not change, dates were updated, adds fix for
ctypes/libffi needed for pip <- required since Python 3.4 (see PEP #453).
python3_3.3.3.bb -> python3_3.4.2.bb: Updates checksums, version, patches and SRC_URIs
to use xz format, adds fix for ctypes/libffi, fixes oe_multilib_header() call,
adds python3-core as RDEPENDS to python3-misc to avoid QA issue.
generate-manifest-3.4.py - > generate-manifest-3.4.py: fixes reprlib,
adds _sitebuiltins and _collections_abc <- formerly part of collections, separated since 3.4
python-3.3-manifest.inc -> python-3.4-manifest.inc
Rebases:
12-distutils-prefix-is-inside-staging-area.patch
python-3.3-multilib.patch
04-default-is-optimized.patch
avoid-ncursesw-include-path.patch
Deletes (fixed upstream):
fix-ast.h-dependency.patch
python3-fix-build-error-with-Readline-6.3.patch
06-ctypes-libffi-fix-configure.patch
remove_sqlite_rpath.patch
[YOCTO #6857]
(From OE-Core rev: 45290ff4d1902bd0ab5377568f969fbb660c0c87)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python-3.4-manifest.inc (renamed from meta/recipes-devtools/python/python-3.3-manifest.inc) | 126 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.4.2.bb (renamed from meta/recipes-devtools/python/python3-native_3.3.3.bb) | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/04-default-is-optimized.patch | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 180 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.4.2.bb (renamed from meta/recipes-devtools/python/python3_3.3.3.bb) | 21 |
7 files changed, 217 insertions, 225 deletions
diff --git a/meta/recipes-devtools/python/python-3.3-manifest.inc b/meta/recipes-devtools/python/python-3.4-manifest.inc index 61119c687c..fa615563fe 100644 --- a/meta/recipes-devtools/python/python-3.3-manifest.inc +++ b/meta/recipes-devtools/python/python-3.4-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.3.py' Version 20140131 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> | 3 | # Generator: './generate-manifest-3.4.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,51 +11,51 @@ PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile ${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="${bindir}/2to3 ${libdir}/python3.3/lib2to3 " | 14 | FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python3.4/lib2to3 " |
15 | 15 | ||
16 | SUMMARY_${PN}-audio="Python Audio Handling" | 16 | SUMMARY_${PN}-audio="Python Audio Handling" |
17 | RDEPENDS_${PN}-audio="${PN}-core" | 17 | RDEPENDS_${PN}-audio="${PN}-core" |
18 | FILES_${PN}-audio="${libdir}/python3.3/wave.* ${libdir}/python3.3/chunk.* ${libdir}/python3.3/sndhdr.* ${libdir}/python3.3/lib-dynload/ossaudiodev.*.so ${libdir}/python3.3/lib-dynload/audioop.*.so ${libdir}/python3.3/audiodev.* ${libdir}/python3.3/sunaudio.* ${libdir}/python3.3/sunau.* ${libdir}/python3.3/toaiff.* " | 18 | 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.* " |
19 | 19 | ||
20 | SUMMARY_${PN}-codecs="Python codecs, encodings & i18n support" | 20 | SUMMARY_${PN}-codecs="Python codecs, encodings & i18n support" |
21 | RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang" | 21 | RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang" |
22 | FILES_${PN}-codecs="${libdir}/python3.3/codecs.* ${libdir}/python3.3/encodings ${libdir}/python3.3/gettext.* ${libdir}/python3.3/locale.* ${libdir}/python3.3/lib-dynload/_locale.*.so ${libdir}/python3.3/lib-dynload/_codecs* ${libdir}/python3.3/lib-dynload/_multibytecodec.*.so ${libdir}/python3.3/lib-dynload/unicodedata.*.so ${libdir}/python3.3/stringprep.* ${libdir}/python3.3/xdrlib.* " | 22 | 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.* " |
23 | 23 | ||
24 | SUMMARY_${PN}-compile="Python bytecode compilation support" | 24 | SUMMARY_${PN}-compile="Python bytecode compilation support" |
25 | RDEPENDS_${PN}-compile="${PN}-core" | 25 | RDEPENDS_${PN}-compile="${PN}-core" |
26 | FILES_${PN}-compile="${libdir}/python3.3/py_compile.* ${libdir}/python3.3/compileall.* " | 26 | FILES_${PN}-compile="${libdir}/python3.4/py_compile.* ${libdir}/python3.4/compileall.* " |
27 | 27 | ||
28 | SUMMARY_${PN}-compression="Python high-level compression support" | 28 | SUMMARY_${PN}-compression="Python high-level compression support" |
29 | RDEPENDS_${PN}-compression="${PN}-core ${PN}-codecs" | 29 | RDEPENDS_${PN}-compression="${PN}-core ${PN}-codecs" |
30 | FILES_${PN}-compression="${libdir}/python3.3/gzip.* ${libdir}/python3.3/zipfile.* ${libdir}/python3.3/tarfile.* ${libdir}/python3.3/lib-dynload/bz2.*.so " | 30 | FILES_${PN}-compression="${libdir}/python3.4/gzip.* ${libdir}/python3.4/zipfile.* ${libdir}/python3.4/tarfile.* ${libdir}/python3.4/lib-dynload/bz2.*.so " |
31 | 31 | ||
32 | SUMMARY_${PN}-core="Python interpreter and core modules" | 32 | SUMMARY_${PN}-core="Python interpreter and core modules" |
33 | RDEPENDS_${PN}-core="${PN}-lang ${PN}-re ${PN}-reprlib ${PN}-codecs ${PN}-io ${PN}-math" | 33 | RDEPENDS_${PN}-core="${PN}-lang ${PN}-re ${PN}-reprlib ${PN}-codecs ${PN}-io ${PN}-math" |
34 | FILES_${PN}-core="${libdir}/python3.3/__future__.* ${libdir}/python3.3/_abcoll.* ${libdir}/python3.3/abc.* ${libdir}/python3.3/copy.* ${libdir}/python3.3/copyreg.* ${libdir}/python3.3/ConfigParser.* ${libdir}/python3.3/genericpath.* ${libdir}/python3.3/getopt.* ${libdir}/python3.3/linecache.* ${libdir}/python3.3/new.* ${libdir}/python3.3/os.* ${libdir}/python3.3/posixpath.* ${libdir}/python3.3/struct.* ${libdir}/python3.3/warnings.* ${libdir}/python3.3/site.* ${libdir}/python3.3/stat.* ${libdir}/python3.3/UserDict.* ${libdir}/python3.3/UserList.* ${libdir}/python3.3/UserString.* ${libdir}/python3.3/lib-dynload/binascii.*.so ${libdir}/python3.3/lib-dynload/_struct.*.so ${libdir}/python3.3/lib-dynload/time.*.so ${libdir}/python3.3/lib-dynload/xreadlines.*.so ${libdir}/python3.3/types.* ${libdir}/python3.3/platform.* ${bindir}/python* ${libdir}/python3.3/_weakrefset.* ${libdir}/python3.3/sysconfig.* ${libdir}/python3.3/_sysconfigdata.* ${libdir}/python3.3/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/collections ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " | 34 | 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_MAJMIN}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/collections ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " |
35 | 35 | ||
36 | SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" | 36 | SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" |
37 | RDEPENDS_${PN}-crypt="${PN}-core" | 37 | RDEPENDS_${PN}-crypt="${PN}-core" |
38 | FILES_${PN}-crypt="${libdir}/python3.3/hashlib.* ${libdir}/python3.3/md5.* ${libdir}/python3.3/sha.* ${libdir}/python3.3/lib-dynload/crypt.*.so ${libdir}/python3.3/lib-dynload/_hashlib.*.so ${libdir}/python3.3/lib-dynload/_sha256.*.so ${libdir}/python3.3/lib-dynload/_sha512.*.so " | 38 | 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 " |
39 | 39 | ||
40 | SUMMARY_${PN}-ctypes="Python C types support" | 40 | SUMMARY_${PN}-ctypes="Python C types support" |
41 | RDEPENDS_${PN}-ctypes="${PN}-core" | 41 | RDEPENDS_${PN}-ctypes="${PN}-core" |
42 | FILES_${PN}-ctypes="${libdir}/python3.3/ctypes ${libdir}/python3.3/lib-dynload/_ctypes.*.so ${libdir}/python3.3/lib-dynload/_ctypes_test.*.so " | 42 | FILES_${PN}-ctypes="${libdir}/python3.4/ctypes ${libdir}/python3.4/lib-dynload/_ctypes.*.so ${libdir}/python3.4/lib-dynload/_ctypes_test.*.so " |
43 | 43 | ||
44 | SUMMARY_${PN}-curses="Python curses support" | 44 | SUMMARY_${PN}-curses="Python curses support" |
45 | RDEPENDS_${PN}-curses="${PN}-core" | 45 | RDEPENDS_${PN}-curses="${PN}-core" |
46 | FILES_${PN}-curses="${libdir}/python3.3/curses ${libdir}/python3.3/lib-dynload/_curses.*.so ${libdir}/python3.3/lib-dynload/_curses_panel.*.so " | 46 | FILES_${PN}-curses="${libdir}/python3.4/curses ${libdir}/python3.4/lib-dynload/_curses.*.so ${libdir}/python3.4/lib-dynload/_curses_panel.*.so " |
47 | 47 | ||
48 | SUMMARY_${PN}-datetime="Python calendar and time support" | 48 | SUMMARY_${PN}-datetime="Python calendar and time support" |
49 | RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs" | 49 | RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs" |
50 | FILES_${PN}-datetime="${libdir}/python3.3/_strptime.* ${libdir}/python3.3/calendar.* ${libdir}/python3.3/lib-dynload/datetime.*.so " | 50 | FILES_${PN}-datetime="${libdir}/python3.4/_strptime.* ${libdir}/python3.4/calendar.* ${libdir}/python3.4/lib-dynload/datetime.*.so " |
51 | 51 | ||
52 | SUMMARY_${PN}-db="Python file-based database support" | 52 | SUMMARY_${PN}-db="Python file-based database support" |
53 | RDEPENDS_${PN}-db="${PN}-core" | 53 | RDEPENDS_${PN}-db="${PN}-core" |
54 | FILES_${PN}-db="${libdir}/python3.3/anydbm.* ${libdir}/python3.3/dumbdbm.* ${libdir}/python3.3/whichdb.* ${libdir}/python3.3/dbm ${libdir}/python3.3/lib-dynload/_dbm.*.so " | 54 | 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 " |
55 | 55 | ||
56 | SUMMARY_${PN}-debugger="Python debugger" | 56 | SUMMARY_${PN}-debugger="Python debugger" |
57 | RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint" | 57 | RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint" |
58 | FILES_${PN}-debugger="${libdir}/python3.3/bdb.* ${libdir}/python3.3/pdb.* " | 58 | FILES_${PN}-debugger="${libdir}/python3.4/bdb.* ${libdir}/python3.4/pdb.* " |
59 | 59 | ||
60 | SUMMARY_${PN}-dev="Python development package" | 60 | SUMMARY_${PN}-dev="Python development package" |
61 | RDEPENDS_${PN}-dev="${PN}-core" | 61 | RDEPENDS_${PN}-dev="${PN}-core" |
@@ -63,203 +63,203 @@ FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdi | |||
63 | 63 | ||
64 | SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" | 64 | SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" |
65 | RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" | 65 | RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" |
66 | FILES_${PN}-difflib="${libdir}/python3.3/difflib.* " | 66 | FILES_${PN}-difflib="${libdir}/python3.4/difflib.* " |
67 | 67 | ||
68 | SUMMARY_${PN}-distutils="Python Distribution Utilities" | 68 | SUMMARY_${PN}-distutils="Python Distribution Utilities" |
69 | RDEPENDS_${PN}-distutils="${PN}-core" | 69 | RDEPENDS_${PN}-distutils="${PN}-core" |
70 | FILES_${PN}-distutils="${libdir}/python3.3/config ${libdir}/python3.3/distutils " | 70 | FILES_${PN}-distutils="${libdir}/python3.4/config ${libdir}/python3.4/distutils " |
71 | 71 | ||
72 | SUMMARY_${PN}-distutils-staticdev="Python distribution utilities (static libraries)" | 72 | SUMMARY_${PN}-distutils-staticdev="Python distribution utilities (static libraries)" |
73 | RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils" | 73 | RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils" |
74 | FILES_${PN}-distutils-staticdev="${libdir}/python3.3/config/lib*.a " | 74 | FILES_${PN}-distutils-staticdev="${libdir}/python3.4/config/lib*.a " |
75 | 75 | ||
76 | SUMMARY_${PN}-doctest="Python framework for running examples in docstrings" | 76 | SUMMARY_${PN}-doctest="Python framework for running examples in docstrings" |
77 | RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib" | 77 | RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib" |
78 | FILES_${PN}-doctest="${libdir}/python3.3/doctest.* " | 78 | FILES_${PN}-doctest="${libdir}/python3.4/doctest.* " |
79 | 79 | ||
80 | SUMMARY_${PN}-elementtree="Python elementree" | 80 | SUMMARY_${PN}-elementtree="Python elementree" |
81 | RDEPENDS_${PN}-elementtree="${PN}-core" | 81 | RDEPENDS_${PN}-elementtree="${PN}-core" |
82 | FILES_${PN}-elementtree="${libdir}/python3.3/lib-dynload/_elementtree.*.so " | 82 | FILES_${PN}-elementtree="${libdir}/python3.4/lib-dynload/_elementtree.*.so " |
83 | 83 | ||
84 | SUMMARY_${PN}-email="Python email support" | 84 | SUMMARY_${PN}-email="Python email support" |
85 | RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient" | 85 | RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient" |
86 | FILES_${PN}-email="${libdir}/python3.3/imaplib.* ${libdir}/python3.3/email " | 86 | FILES_${PN}-email="${libdir}/python3.4/imaplib.* ${libdir}/python3.4/email " |
87 | 87 | ||
88 | SUMMARY_${PN}-fcntl="Python's fcntl interface" | 88 | SUMMARY_${PN}-fcntl="Python's fcntl interface" |
89 | RDEPENDS_${PN}-fcntl="${PN}-core" | 89 | RDEPENDS_${PN}-fcntl="${PN}-core" |
90 | FILES_${PN}-fcntl="${libdir}/python3.3/lib-dynload/fcntl.*.so " | 90 | FILES_${PN}-fcntl="${libdir}/python3.4/lib-dynload/fcntl.*.so " |
91 | 91 | ||
92 | SUMMARY_${PN}-gdbm="Python GNU database support" | 92 | SUMMARY_${PN}-gdbm="Python GNU database support" |
93 | RDEPENDS_${PN}-gdbm="${PN}-core" | 93 | RDEPENDS_${PN}-gdbm="${PN}-core" |
94 | FILES_${PN}-gdbm="${libdir}/python3.3/lib-dynload/_gdbm.*.so " | 94 | FILES_${PN}-gdbm="${libdir}/python3.4/lib-dynload/_gdbm.*.so " |
95 | 95 | ||
96 | SUMMARY_${PN}-html="Python HTML processing support" | 96 | SUMMARY_${PN}-html="Python HTML processing support" |
97 | RDEPENDS_${PN}-html="${PN}-core" | 97 | RDEPENDS_${PN}-html="${PN}-core" |
98 | FILES_${PN}-html="${libdir}/python3.3/formatter.* ${libdir}/python3.3/htmlentitydefs.* ${libdir}/python3.3/htmllib.* ${libdir}/python3.3/markupbase.* ${libdir}/python3.3/sgmllib.* ${libdir}/python3.3/HTMLParser.* " | 98 | 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.* " |
99 | 99 | ||
100 | SUMMARY_${PN}-idle="Python Integrated Development Environment" | 100 | SUMMARY_${PN}-idle="Python Integrated Development Environment" |
101 | RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter" | 101 | RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter" |
102 | FILES_${PN}-idle="${bindir}/idle ${libdir}/python3.3/idlelib " | 102 | FILES_${PN}-idle="${bindir}/idle ${libdir}/python3.4/idlelib " |
103 | 103 | ||
104 | SUMMARY_${PN}-image="Python graphical image handling" | 104 | SUMMARY_${PN}-image="Python graphical image handling" |
105 | RDEPENDS_${PN}-image="${PN}-core" | 105 | RDEPENDS_${PN}-image="${PN}-core" |
106 | FILES_${PN}-image="${libdir}/python3.3/colorsys.* ${libdir}/python3.3/imghdr.* ${libdir}/python3.3/lib-dynload/imageop.*.so ${libdir}/python3.3/lib-dynload/rgbimg.*.so " | 106 | 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 " |
107 | 107 | ||
108 | SUMMARY_${PN}-importlib="Python import implementation library" | 108 | SUMMARY_${PN}-importlib="Python import implementation library" |
109 | RDEPENDS_${PN}-importlib="${PN}-core" | 109 | RDEPENDS_${PN}-importlib="${PN}-core" |
110 | FILES_${PN}-importlib="${libdir}/python3.3/importlib " | 110 | FILES_${PN}-importlib="${libdir}/python3.4/importlib " |
111 | 111 | ||
112 | SUMMARY_${PN}-io="Python low-level I/O" | 112 | SUMMARY_${PN}-io="Python low-level I/O" |
113 | RDEPENDS_${PN}-io="${PN}-core ${PN}-math" | 113 | RDEPENDS_${PN}-io="${PN}-core ${PN}-math" |
114 | FILES_${PN}-io="${libdir}/python3.3/lib-dynload/_socket.*.so ${libdir}/python3.3/lib-dynload/_io.*.so ${libdir}/python3.3/lib-dynload/_ssl.*.so ${libdir}/python3.3/lib-dynload/select.*.so ${libdir}/python3.3/lib-dynload/termios.*.so ${libdir}/python3.3/lib-dynload/cStringIO.*.so ${libdir}/python3.3/pipes.* ${libdir}/python3.3/socket.* ${libdir}/python3.3/ssl.* ${libdir}/python3.3/tempfile.* ${libdir}/python3.3/StringIO.* ${libdir}/python3.3/io.* ${libdir}/python3.3/_pyio.* " | 114 | 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.* " |
115 | 115 | ||
116 | SUMMARY_${PN}-json="Python JSON support" | 116 | SUMMARY_${PN}-json="Python JSON support" |
117 | RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" | 117 | RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" |
118 | FILES_${PN}-json="${libdir}/python3.3/json ${libdir}/python3.3/lib-dynload/_json.*.so " | 118 | FILES_${PN}-json="${libdir}/python3.4/json ${libdir}/python3.4/lib-dynload/_json.*.so " |
119 | 119 | ||
120 | SUMMARY_${PN}-lang="Python low-level language support" | 120 | SUMMARY_${PN}-lang="Python low-level language support" |
121 | RDEPENDS_${PN}-lang="${PN}-core" | 121 | RDEPENDS_${PN}-lang="${PN}-core" |
122 | FILES_${PN}-lang="${libdir}/python3.3/lib-dynload/_bisect.*.so ${libdir}/python3.3/lib-dynload/_collections.*.so ${libdir}/python3.3/lib-dynload/_heapq.*.so ${libdir}/python3.3/lib-dynload/_weakref.*.so ${libdir}/python3.3/lib-dynload/_functools.*.so ${libdir}/python3.3/lib-dynload/array.*.so ${libdir}/python3.3/lib-dynload/itertools.*.so ${libdir}/python3.3/lib-dynload/operator.*.so ${libdir}/python3.3/lib-dynload/parser.*.so ${libdir}/python3.3/atexit.* ${libdir}/python3.3/bisect.* ${libdir}/python3.3/code.* ${libdir}/python3.3/codeop.* ${libdir}/python3.3/collections.* ${libdir}/python3.3/dis.* ${libdir}/python3.3/functools.* ${libdir}/python3.3/heapq.* ${libdir}/python3.3/inspect.* ${libdir}/python3.3/keyword.* ${libdir}/python3.3/opcode.* ${libdir}/python3.3/symbol.* ${libdir}/python3.3/repr.* ${libdir}/python3.3/token.* ${libdir}/python3.3/tokenize.* ${libdir}/python3.3/traceback.* ${libdir}/python3.3/weakref.* " | 122 | 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.* " |
123 | 123 | ||
124 | SUMMARY_${PN}-logging="Python logging support" | 124 | SUMMARY_${PN}-logging="Python logging support" |
125 | RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold" | 125 | RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold" |
126 | FILES_${PN}-logging="${libdir}/python3.3/logging " | 126 | FILES_${PN}-logging="${libdir}/python3.4/logging " |
127 | 127 | ||
128 | SUMMARY_${PN}-mailbox="Python mailbox format support" | 128 | SUMMARY_${PN}-mailbox="Python mailbox format support" |
129 | RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime" | 129 | RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime" |
130 | FILES_${PN}-mailbox="${libdir}/python3.3/mailbox.* " | 130 | FILES_${PN}-mailbox="${libdir}/python3.4/mailbox.* " |
131 | 131 | ||
132 | SUMMARY_${PN}-math="Python math support" | 132 | SUMMARY_${PN}-math="Python math support" |
133 | RDEPENDS_${PN}-math="${PN}-core" | 133 | RDEPENDS_${PN}-math="${PN}-core" |
134 | FILES_${PN}-math="${libdir}/python3.3/lib-dynload/cmath.*.so ${libdir}/python3.3/lib-dynload/math.*.so ${libdir}/python3.3/lib-dynload/_random.*.so ${libdir}/python3.3/random.* ${libdir}/python3.3/sets.* " | 134 | 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.* " |
135 | 135 | ||
136 | SUMMARY_${PN}-mime="Python MIME handling APIs" | 136 | SUMMARY_${PN}-mime="Python MIME handling APIs" |
137 | RDEPENDS_${PN}-mime="${PN}-core ${PN}-io" | 137 | RDEPENDS_${PN}-mime="${PN}-core ${PN}-io" |
138 | FILES_${PN}-mime="${libdir}/python3.3/mimetools.* ${libdir}/python3.3/uu.* ${libdir}/python3.3/quopri.* ${libdir}/python3.3/rfc822.* ${libdir}/python3.3/MimeWriter.* " | 138 | FILES_${PN}-mime="${libdir}/python3.4/mimetools.* ${libdir}/python3.4/uu.* ${libdir}/python3.4/quopri.* ${libdir}/python3.4/rfc822.* ${libdir}/python3.4/MimeWriter.* " |
139 | 139 | ||
140 | SUMMARY_${PN}-mmap="Python memory-mapped file support" | 140 | SUMMARY_${PN}-mmap="Python memory-mapped file support" |
141 | RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io" | 141 | RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io" |
142 | FILES_${PN}-mmap="${libdir}/python3.3/lib-dynload/mmap.*.so " | 142 | FILES_${PN}-mmap="${libdir}/python3.4/lib-dynload/mmap.*.so " |
143 | 143 | ||
144 | SUMMARY_${PN}-multiprocessing="Python multiprocessing support" | 144 | SUMMARY_${PN}-multiprocessing="Python multiprocessing support" |
145 | RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap" | 145 | RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap" |
146 | FILES_${PN}-multiprocessing="${libdir}/python3.3/lib-dynload/_multiprocessing.*.so ${libdir}/python3.3/multiprocessing " | 146 | FILES_${PN}-multiprocessing="${libdir}/python3.4/lib-dynload/_multiprocessing.*.so ${libdir}/python3.4/multiprocessing " |
147 | 147 | ||
148 | SUMMARY_${PN}-netclient="Python Internet Protocol clients" | 148 | SUMMARY_${PN}-netclient="Python Internet Protocol clients" |
149 | RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" | 149 | RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" |
150 | FILES_${PN}-netclient="${libdir}/python3.3/*Cookie*.* ${libdir}/python3.3/base64.* ${libdir}/python3.3/cookielib.* ${libdir}/python3.3/ftplib.* ${libdir}/python3.3/gopherlib.* ${libdir}/python3.3/hmac.* ${libdir}/python3.3/httplib.* ${libdir}/python3.3/mimetypes.* ${libdir}/python3.3/nntplib.* ${libdir}/python3.3/poplib.* ${libdir}/python3.3/smtplib.* ${libdir}/python3.3/telnetlib.* ${libdir}/python3.3/urllib.* ${libdir}/python3.3/urllib2.* ${libdir}/python3.3/urlparse.* ${libdir}/python3.3/uuid.* ${libdir}/python3.3/rfc822.* ${libdir}/python3.3/mimetools.* " | 150 | 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/urllib2.* ${libdir}/python3.4/urlparse.* ${libdir}/python3.4/uuid.* ${libdir}/python3.4/rfc822.* ${libdir}/python3.4/mimetools.* " |
151 | 151 | ||
152 | SUMMARY_${PN}-netserver="Python Internet Protocol servers" | 152 | SUMMARY_${PN}-netserver="Python Internet Protocol servers" |
153 | RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient" | 153 | RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient" |
154 | FILES_${PN}-netserver="${libdir}/python3.3/cgi.* ${libdir}/python3.3/*HTTPServer.* ${libdir}/python3.3/SocketServer.* " | 154 | FILES_${PN}-netserver="${libdir}/python3.4/cgi.* ${libdir}/python3.4/*HTTPServer.* ${libdir}/python3.4/SocketServer.* " |
155 | 155 | ||
156 | SUMMARY_${PN}-numbers="Python number APIs" | 156 | SUMMARY_${PN}-numbers="Python number APIs" |
157 | RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re" | 157 | RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re" |
158 | FILES_${PN}-numbers="${libdir}/python3.3/decimal.* ${libdir}/python3.3/numbers.* " | 158 | FILES_${PN}-numbers="${libdir}/python3.4/decimal.* ${libdir}/python3.4/numbers.* " |
159 | 159 | ||
160 | SUMMARY_${PN}-pickle="Python serialisation/persistence support" | 160 | SUMMARY_${PN}-pickle="Python serialisation/persistence support" |
161 | RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re" | 161 | RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re" |
162 | FILES_${PN}-pickle="${libdir}/python3.3/pickle.* ${libdir}/python3.3/shelve.* ${libdir}/python3.3/lib-dynload/cPickle.*.so ${libdir}/python3.3/pickletools.* " | 162 | FILES_${PN}-pickle="${libdir}/python3.4/pickle.* ${libdir}/python3.4/shelve.* ${libdir}/python3.4/lib-dynload/cPickle.*.so ${libdir}/python3.4/pickletools.* " |
163 | 163 | ||
164 | SUMMARY_${PN}-pkgutil="Python package extension utility support" | 164 | SUMMARY_${PN}-pkgutil="Python package extension utility support" |
165 | RDEPENDS_${PN}-pkgutil="${PN}-core" | 165 | RDEPENDS_${PN}-pkgutil="${PN}-core" |
166 | FILES_${PN}-pkgutil="${libdir}/python3.3/pkgutil.* " | 166 | FILES_${PN}-pkgutil="${libdir}/python3.4/pkgutil.* " |
167 | 167 | ||
168 | SUMMARY_${PN}-pprint="Python pretty-print support" | 168 | SUMMARY_${PN}-pprint="Python pretty-print support" |
169 | RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io" | 169 | RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io" |
170 | FILES_${PN}-pprint="${libdir}/python3.3/pprint.* " | 170 | FILES_${PN}-pprint="${libdir}/python3.4/pprint.* " |
171 | 171 | ||
172 | SUMMARY_${PN}-profile="Python basic performance profiling support" | 172 | SUMMARY_${PN}-profile="Python basic performance profiling support" |
173 | RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils" | 173 | RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils" |
174 | FILES_${PN}-profile="${libdir}/python3.3/profile.* ${libdir}/python3.3/pstats.* ${libdir}/python3.3/cProfile.* ${libdir}/python3.3/lib-dynload/_lsprof.*.so " | 174 | FILES_${PN}-profile="${libdir}/python3.4/profile.* ${libdir}/python3.4/pstats.* ${libdir}/python3.4/cProfile.* ${libdir}/python3.4/lib-dynload/_lsprof.*.so " |
175 | 175 | ||
176 | SUMMARY_${PN}-pydoc="Python interactive help support" | 176 | SUMMARY_${PN}-pydoc="Python interactive help support" |
177 | RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re" | 177 | RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re" |
178 | FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python3.3/pydoc.* ${libdir}/python3.3/pydoc_data " | 178 | FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python3.4/pydoc.* ${libdir}/python3.4/pydoc_data " |
179 | 179 | ||
180 | SUMMARY_${PN}-re="Python Regular Expression APIs" | 180 | SUMMARY_${PN}-re="Python Regular Expression APIs" |
181 | RDEPENDS_${PN}-re="${PN}-core" | 181 | RDEPENDS_${PN}-re="${PN}-core" |
182 | FILES_${PN}-re="${libdir}/python3.3/re.* ${libdir}/python3.3/sre.* ${libdir}/python3.3/sre_compile.* ${libdir}/python3.3/sre_constants* ${libdir}/python3.3/sre_parse.* " | 182 | 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.* " |
183 | 183 | ||
184 | SUMMARY_${PN}-readline="Python readline support" | 184 | SUMMARY_${PN}-readline="Python readline support" |
185 | RDEPENDS_${PN}-readline="${PN}-core" | 185 | RDEPENDS_${PN}-readline="${PN}-core" |
186 | FILES_${PN}-readline="${libdir}/python3.3/lib-dynload/readline.*.so ${libdir}/python3.3/rlcompleter.* " | 186 | FILES_${PN}-readline="${libdir}/python3.4/lib-dynload/readline.*.so ${libdir}/python3.4/rlcompleter.* " |
187 | 187 | ||
188 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" | 188 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" |
189 | RDEPENDS_${PN}-reprlib="${PN}-core" | 189 | RDEPENDS_${PN}-reprlib="${PN}-core" |
190 | FILES_${PN}-reprlib="${libdir}/python3.3/reprlib.py " | 190 | FILES_${PN}-reprlib="${libdir}/python3.4/reprlib.py " |
191 | 191 | ||
192 | SUMMARY_${PN}-resource="Python resource control interface" | 192 | SUMMARY_${PN}-resource="Python resource control interface" |
193 | RDEPENDS_${PN}-resource="${PN}-core" | 193 | RDEPENDS_${PN}-resource="${PN}-core" |
194 | FILES_${PN}-resource="${libdir}/python3.3/lib-dynload/resource.*.so " | 194 | FILES_${PN}-resource="${libdir}/python3.4/lib-dynload/resource.*.so " |
195 | 195 | ||
196 | SUMMARY_${PN}-robotparser="Python robots.txt parser" | 196 | SUMMARY_${PN}-robotparser="Python robots.txt parser" |
197 | RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient" | 197 | RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient" |
198 | FILES_${PN}-robotparser="${libdir}/python3.3/urllib/robotparser.* " | 198 | FILES_${PN}-robotparser="${libdir}/python3.4/urllib/robotparser.* " |
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.3/cmd.* ${libdir}/python3.3/commands.* ${libdir}/python3.3/dircache.* ${libdir}/python3.3/fnmatch.* ${libdir}/python3.3/glob.* ${libdir}/python3.3/popen2.* ${libdir}/python3.3/shlex.* ${libdir}/python3.3/shutil.* " | 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.* " |
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.3/smtpd.* " | 206 | FILES_${PN}-smtpd="${bindir}/smtpd.* ${libdir}/python3.4/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.3/lib-dynload/_sqlite3.*.so ${libdir}/python3.3/sqlite3/dbapi2.* ${libdir}/python3.3/sqlite3/__init__.* ${libdir}/python3.3/sqlite3/dump.* " | 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.* " |
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.3/sqlite3/test " | 214 | FILES_${PN}-sqlite3-tests="${libdir}/python3.4/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.3/lib-dynload/strop.*.so ${libdir}/python3.3/string.* ${libdir}/python3.3/stringold.* " | 218 | FILES_${PN}-stringold="${libdir}/python3.4/lib-dynload/strop.*.so ${libdir}/python3.4/string.* ${libdir}/python3.4/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.3/subprocess.* " | 222 | FILES_${PN}-subprocess="${libdir}/python3.4/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.3/lib-dynload/syslog.*.so " | 226 | FILES_${PN}-syslog="${libdir}/python3.4/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.3/pty.* ${libdir}/python3.3/tty.* " | 230 | FILES_${PN}-terminal="${libdir}/python3.4/pty.* ${libdir}/python3.4/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.3/test " | 234 | FILES_${PN}-tests="${libdir}/python3.4/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.3/lib-dynload/_csv.*.so ${libdir}/python3.3/csv.* ${libdir}/python3.3/optparse.* ${libdir}/python3.3/textwrap.* " | 238 | FILES_${PN}-textutils="${libdir}/python3.4/lib-dynload/_csv.*.so ${libdir}/python3.4/csv.* ${libdir}/python3.4/optparse.* ${libdir}/python3.4/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.3/_threading_local.* ${libdir}/python3.3/dummy_thread.* ${libdir}/python3.3/dummy_threading.* ${libdir}/python3.3/mutex.* ${libdir}/python3.3/threading.* ${libdir}/python3.3/Queue.* " | 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.* " |
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.3/lib-dynload/_tkinter.*.so ${libdir}/python3.3/lib-tk ${libdir}/python3.3/tkinter " | 246 | FILES_${PN}-tkinter="${libdir}/python3.4/lib-dynload/_tkinter.*.so ${libdir}/python3.4/lib-tk ${libdir}/python3.4/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.3/unittest/ " | 250 | FILES_${PN}-unittest="${libdir}/python3.4/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.3/lib-dynload/nis.*.so ${libdir}/python3.3/lib-dynload/grp.*.so ${libdir}/python3.3/lib-dynload/pwd.*.so ${libdir}/python3.3/getpass.* " | 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.* " |
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.3/lib-dynload/pyexpat.*.so ${libdir}/python3.3/xml ${libdir}/python3.3/xmllib.* " | 258 | FILES_${PN}-xml="${libdir}/python3.4/lib-dynload/pyexpat.*.so ${libdir}/python3.4/xml ${libdir}/python3.4/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.3/xmlrpclib.* ${libdir}/python3.3/SimpleXMLRPCServer.* ${libdir}/python3.3/DocXMLRPCServer.* ${libdir}/python3.3/xmlrpc " | 262 | FILES_${PN}-xmlrpc="${libdir}/python3.4/xmlrpclib.* ${libdir}/python3.4/SimpleXMLRPCServer.* ${libdir}/python3.4/DocXMLRPCServer.* ${libdir}/python3.4/xmlrpc " |
263 | 263 | ||
264 | SUMMARY_${PN}-modules="All Python modules" | 264 | SUMMARY_${PN}-modules="All Python modules" |
265 | RDEPENDS_${PN}-modules="${PN}-2to3 ${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}-robotparser ${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}-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}-robotparser ${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.3.3.bb b/meta/recipes-devtools/python/python3-native_3.4.2.bb index 73ce0952bd..d98a278867 100644 --- a/meta/recipes-devtools/python/python3-native_3.3.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.4.2.bb | |||
@@ -1,10 +1,10 @@ | |||
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.3" | 4 | PYTHON_MAJMIN = "3.4" |
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.bz2 \ | 7 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ |
8 | file://12-distutils-prefix-is-inside-staging-area.patch \ | 8 | file://12-distutils-prefix-is-inside-staging-area.patch \ |
9 | file://python-config.patch \ | 9 | file://python-config.patch \ |
10 | file://000-cross-compile.patch \ | 10 | file://000-cross-compile.patch \ |
@@ -18,22 +18,19 @@ file://150-fix-setupterm.patch \ | |||
18 | file://python-3.3-multilib.patch \ | 18 | file://python-3.3-multilib.patch \ |
19 | file://03-fix-tkinter-detection.patch \ | 19 | file://03-fix-tkinter-detection.patch \ |
20 | file://avoid_warning_about_tkinter.patch \ | 20 | file://avoid_warning_about_tkinter.patch \ |
21 | file://06-ctypes-libffi-fix-configure.patch \ | ||
22 | file://shutil-follow-symlink-fix.patch \ | 21 | file://shutil-follow-symlink-fix.patch \ |
23 | 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 \ |
24 | file://sysroot-include-headers.patch \ | 23 | file://sysroot-include-headers.patch \ |
25 | file://unixccompiler.patch \ | 24 | file://unixccompiler.patch \ |
26 | file://fix-ast.h-dependency.patch \ | ||
27 | file://makerace.patch \ | 25 | file://makerace.patch \ |
28 | ${DISTRO_SRC_URI} \ | 26 | ${DISTRO_SRC_URI} \ |
29 | file://python3-fix-build-error-with-Readline-6.3.patch \ | ||
30 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ | 27 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ |
31 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ | 28 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ |
32 | " | 29 | " |
33 | SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" | 30 | SRC_URI[md5sum] = "36fc7327c02c6f12fa24fc9ba78039e3" |
34 | SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb" | 31 | SRC_URI[sha256sum] = "1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def" |
35 | 32 | ||
36 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4eaea08eaaf6875189b0c49f26fa2005" | 33 | LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" |
37 | 34 | ||
38 | S = "${WORKDIR}/Python-${PV}" | 35 | S = "${WORKDIR}/Python-${PV}" |
39 | 36 | ||
@@ -59,8 +56,8 @@ EXTRA_OEMAKE = '\ | |||
59 | # No ctypes option for python 3 | 56 | # No ctypes option for python 3 |
60 | PYTHONLSBOPTS = "" | 57 | PYTHONLSBOPTS = "" |
61 | 58 | ||
62 | do_configure_prepend() { | 59 | do_configure_append() { |
63 | autoreconf --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf" | 60 | autoreconf --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi |
64 | } | 61 | } |
65 | 62 | ||
66 | do_install() { | 63 | do_install() { |
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 d5afd40025..3b8f264a58 100644 --- a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch +++ b/meta/recipes-devtools/python/python3/04-default-is-optimized.patch | |||
@@ -1,20 +1,21 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | Updated original patch for python 2.7.3 | ||
4 | |||
5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
6 | 2012/05/01 | ||
7 | |||
8 | |||
9 | # when compiling for an embedded system, we need every bit of | 3 | # when compiling for an embedded system, we need every bit of |
10 | # performance we can get. default to optimized with the option | 4 | # performance we can get. default to optimized with the option |
11 | # of opt-out. | 5 | # of opt-out. |
12 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> | 6 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> |
13 | 7 | ||
14 | Index: Python-3.2.3/Python/compile.c | 8 | |
9 | 2012/05/01 | ||
10 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
11 | |||
12 | Rebased for 3.4.2 02/2015 | ||
13 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
14 | |||
15 | Index: Python-3.4.2/Python/compile.c | ||
15 | =================================================================== | 16 | =================================================================== |
16 | --- Python-3.2.3.orig/Python/compile.c 2012-04-10 23:54:08.000000000 -0700 | 17 | --- Python-3.4.2.orig/Python/compile.c |
17 | +++ Python-3.2.3/Python/compile.c 2012-09-19 15:58:46.649123998 -0700 | 18 | +++ Python-3.4.2/Python/compile.c |
18 | @@ -30,7 +30,7 @@ | 19 | @@ -30,7 +30,7 @@ |
19 | #include "symtable.h" | 20 | #include "symtable.h" |
20 | #include "opcode.h" | 21 | #include "opcode.h" |
@@ -24,28 +25,28 @@ Index: Python-3.2.3/Python/compile.c | |||
24 | 25 | ||
25 | #define DEFAULT_BLOCK_SIZE 16 | 26 | #define DEFAULT_BLOCK_SIZE 16 |
26 | #define DEFAULT_BLOCKS 8 | 27 | #define DEFAULT_BLOCKS 8 |
27 | Index: Python-3.2.3/Modules/main.c | 28 | Index: Python-3.4.2/Modules/main.c |
28 | =================================================================== | 29 | =================================================================== |
29 | --- Python-3.2.3.orig/Modules/main.c 2012-04-10 23:54:07.000000000 -0700 | 30 | --- Python-3.4.2.orig/Modules/main.c |
30 | +++ Python-3.2.3/Modules/main.c 2012-09-19 16:00:32.153124053 -0700 | 31 | +++ Python-3.4.2/Modules/main.c |
31 | @@ -46,7 +46,7 @@ | 32 | @@ -38,7 +38,7 @@ static wchar_t **orig_argv; |
32 | static int orig_argc; | 33 | static int orig_argc; |
33 | 34 | ||
34 | /* command line options */ | 35 | /* command line options */ |
35 | -#define BASE_OPTS L"bBc:dEhiJm:OqRsStuvVW:xX:?" | 36 | -#define BASE_OPTS L"bBc:dEhiIJm:OqRsStuvVW:xX:?" |
36 | +#define BASE_OPTS L"bBc:dEhiJm:NOqRsStuvVW:xX:?" | 37 | +#define BASE_OPTS L"bBc:dEhiIJm:NOqRsStuvVW:xX:?" |
37 | 38 | ||
38 | #define PROGRAM_OPTS BASE_OPTS | 39 | #define PROGRAM_OPTS BASE_OPTS |
39 | 40 | ||
40 | @@ -71,6 +71,7 @@ | 41 | @@ -64,6 +64,7 @@ static char *usage_2 = "\ |
41 | -m mod : run library module as a script (terminates option list)\n\ | 42 | -m mod : run library module as a script (terminates option list)\n\ |
42 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ | 43 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ |
43 | -OO : remove doc-strings in addition to the -O optimizations\n\ | 44 | -OO : remove doc-strings in addition to the -O optimizations\n\ |
44 | +-N : do NOT optimize generated bytecode\n\ | 45 | +-N : do NOT optimize generated bytecode\n\ |
45 | -q : don't print version and copyright messages on interactive startup\n\ | 46 | -q : don't print version and copyright messages on interactive startup\n\ |
46 | -R : use a pseudo-random salt to make hash() values of various types be\n\ | 47 | -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ |
47 | unpredictable between separate invocations of the interpreter, as\n\ | 48 | -S : don't imply 'import site' on initialization\n\ |
48 | @@ -407,8 +408,8 @@ | 49 | @@ -418,8 +419,8 @@ Py_Main(int argc, wchar_t **argv) |
49 | 50 | ||
50 | /* case 'J': reserved for Jython */ | 51 | /* case 'J': reserved for Jython */ |
51 | 52 | ||
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index c5846a5af8..bf02df2025 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch | |||
@@ -1,15 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | 02/2015 Rebased for Python 3.4.2 | ||
4 | |||
3 | # The proper prefix is inside our staging area. | 5 | # The proper prefix is inside our staging area. |
4 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> | 6 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> |
5 | # Signed-off-by: Phil Blundell <philb@gnu.org> | 7 | # Signed-off-by: Phil Blundell <philb@gnu.org> |
6 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | # Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
7 | 10 | ||
8 | Index: Python-3.3.2/Lib/distutils/sysconfig.py | 11 | Index: Python-3.4.2/Lib/distutils/sysconfig.py |
9 | =================================================================== | 12 | =================================================================== |
10 | --- Python-3.3.2.orig/Lib/distutils/sysconfig.py 2013-07-30 00:00:52.769749805 -0700 | 13 | --- Python-3.4.2.orig/Lib/distutils/sysconfig.py |
11 | +++ Python-3.3.2/Lib/distutils/sysconfig.py 2013-07-30 00:16:22.545767248 -0700 | 14 | +++ Python-3.4.2/Lib/distutils/sysconfig.py |
12 | @@ -16,10 +16,11 @@ | 15 | @@ -16,10 +16,11 @@ import sys |
13 | from .errors import DistutilsPlatformError | 16 | from .errors import DistutilsPlatformError |
14 | 17 | ||
15 | # These are needed in a couple of spots, so just compute them once. | 18 | # These are needed in a couple of spots, so just compute them once. |
@@ -25,7 +28,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py | |||
25 | 28 | ||
26 | # Path to the base directory of the project. On Windows the binary may | 29 | # Path to the base directory of the project. On Windows the binary may |
27 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, | 30 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, |
28 | @@ -93,7 +94,9 @@ | 31 | @@ -93,7 +94,9 @@ def get_python_inc(plat_specific=0, pref |
29 | If 'prefix' is supplied, use it instead of sys.base_prefix or | 32 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
30 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | 33 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
31 | """ | 34 | """ |
@@ -36,7 +39,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py | |||
36 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | 39 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
37 | if os.name == "posix": | 40 | if os.name == "posix": |
38 | if python_build: | 41 | if python_build: |
39 | @@ -136,6 +139,12 @@ | 42 | @@ -134,6 +137,12 @@ def get_python_lib(plat_specific=0, stan |
40 | If 'prefix' is supplied, use it instead of sys.base_prefix or | 43 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
41 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | 44 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
42 | """ | 45 | """ |
@@ -49,7 +52,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py | |||
49 | if prefix is None: | 52 | if prefix is None: |
50 | if standard_lib: | 53 | if standard_lib: |
51 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | 54 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
52 | @@ -144,7 +153,7 @@ | 55 | @@ -142,7 +151,7 @@ def get_python_lib(plat_specific=0, stan |
53 | 56 | ||
54 | if os.name == "posix": | 57 | if os.name == "posix": |
55 | libpython = os.path.join(prefix, | 58 | libpython = os.path.join(prefix, |
@@ -58,16 +61,16 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py | |||
58 | if standard_lib: | 61 | if standard_lib: |
59 | return libpython | 62 | return libpython |
60 | else: | 63 | else: |
61 | @@ -249,7 +258,7 @@ | 64 | @@ -242,7 +251,7 @@ def get_config_h_filename(): |
62 | else: | 65 | else: |
63 | # The name of the config.h file changed in 2.2 | 66 | inc_dir = get_python_inc(plat_specific=1) |
64 | config_h = 'pyconfig.h' | 67 | |
65 | - return os.path.join(inc_dir, config_h) | 68 | - return os.path.join(inc_dir, 'pyconfig.h') |
66 | + return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) | 69 | + return os.path.join(inc_dir, 'pyconfig.h'.replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )) |
67 | 70 | ||
68 | 71 | ||
69 | def get_makefile_filename(): | 72 | def get_makefile_filename(): |
70 | @@ -258,7 +267,7 @@ | 73 | @@ -251,7 +260,7 @@ def get_makefile_filename(): |
71 | return os.path.join(_sys_home or project_base, "Makefile") | 74 | return os.path.join(_sys_home or project_base, "Makefile") |
72 | lib_dir = get_python_lib(plat_specific=0, standard_lib=1) | 75 | lib_dir = get_python_lib(plat_specific=0, standard_lib=1) |
73 | config_file = 'config-{}{}'.format(get_python_version(), build_flags) | 76 | config_file = 'config-{}{}'.format(get_python_version(), build_flags) |
diff --git a/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch b/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch index 054a13124c..f29ae53371 100644 --- a/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch +++ b/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch | |||
@@ -1,29 +1,21 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | We should make sure that sysroot is used by gcc instead of assuming | 3 | We should make sure that sysroot is used by gcc instead of assuming |
2 | hardcoded locations for include paths | 4 | hardcoded locations for include paths |
3 | 5 | ||
4 | Upstream-Status: Pending | ||
5 | 6 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | : | 8 | |
8 | Index: Python-3.3.3/configure.ac | 9 | Index: Python-3.4.2/configure.ac |
9 | =================================================================== | 10 | =================================================================== |
10 | --- Python-3.3.3.orig/configure.ac 2014-01-29 19:00:15.245312752 -0800 | 11 | --- Python-3.4.2.orig/configure.ac |
11 | +++ Python-3.3.3/configure.ac 2014-01-29 23:27:22.938526262 -0800 | 12 | +++ Python-3.4.2/configure.ac |
12 | @@ -1548,7 +1548,7 @@ | 13 | @@ -4434,7 +4434,7 @@ fi |
13 | # checks for header files | ||
14 | AC_HEADER_STDC | ||
15 | ac_save_cppflags="$CPPFLAGS" | ||
16 | -CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" | ||
17 | +CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" | ||
18 | AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \ | ||
19 | fcntl.h grp.h \ | ||
20 | ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \ | ||
21 | @@ -4308,7 +4308,7 @@ | ||
22 | fi | ||
23 | 14 | ||
15 | # first curses header check | ||
24 | ac_save_cppflags="$CPPFLAGS" | 16 | ac_save_cppflags="$CPPFLAGS" |
25 | -CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" | 17 | -CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
26 | +CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" | 18 | +CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" |
27 | # On HP/UX 11.0, mvwdelch is a block with a return statement | 19 | |
28 | AC_MSG_CHECKING(whether mvwdelch is an expression) | 20 | AC_CHECK_HEADERS(curses.h ncurses.h) |
29 | AC_CACHE_VAL(ac_cv_mvwdelch_is_expression, | 21 | |
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 7d66a0e00d..b3e986089e 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch | |||
@@ -1,14 +1,17 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | get the sys.lib from python itself and do not use hardcoded value of 'lib' | 3 | get the sys.lib from python itself and do not use hardcoded value of 'lib' |
2 | 4 | ||
3 | -Khem | 5 | 02/2015 Rebased for 3.4.2 |
4 | 6 | ||
5 | Upstream-Status: Pending | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
6 | 9 | ||
7 | Index: Python-3.3.2/Include/pythonrun.h | 10 | Index: Python-3.4.2/Include/pythonrun.h |
8 | =================================================================== | 11 | =================================================================== |
9 | --- Python-3.3.2.orig/Include/pythonrun.h 2013-05-15 09:32:54.000000000 -0700 | 12 | --- Python-3.4.2.orig/Include/pythonrun.h |
10 | +++ Python-3.3.2/Include/pythonrun.h 2013-07-27 16:19:54.099877246 -0700 | 13 | +++ Python-3.4.2/Include/pythonrun.h |
11 | @@ -181,6 +181,8 @@ | 14 | @@ -220,6 +220,8 @@ int _Py_CheckPython3(); |
12 | /* In their own files */ | 15 | /* In their own files */ |
13 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 16 | PyAPI_FUNC(const char *) Py_GetVersion(void); |
14 | PyAPI_FUNC(const char *) Py_GetPlatform(void); | 17 | PyAPI_FUNC(const char *) Py_GetPlatform(void); |
@@ -17,20 +20,20 @@ Index: Python-3.3.2/Include/pythonrun.h | |||
17 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 20 | PyAPI_FUNC(const char *) Py_GetCopyright(void); |
18 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 21 | PyAPI_FUNC(const char *) Py_GetCompiler(void); |
19 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 22 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); |
20 | Index: Python-3.3.2/Lib/distutils/command/install.py | 23 | Index: Python-3.4.2/Lib/distutils/command/install.py |
21 | =================================================================== | 24 | =================================================================== |
22 | --- Python-3.3.2.orig/Lib/distutils/command/install.py 2013-05-15 09:32:54.000000000 -0700 | 25 | --- Python-3.4.2.orig/Lib/distutils/command/install.py |
23 | +++ Python-3.3.2/Lib/distutils/command/install.py 2013-07-27 16:19:54.099877246 -0700 | 26 | +++ Python-3.4.2/Lib/distutils/command/install.py |
24 | @@ -25,6 +25,8 @@ | 27 | @@ -19,6 +19,8 @@ from site import USER_BASE |
25 | from site import USER_SITE | 28 | from site import USER_SITE |
26 | HAS_USER_SITE = True | 29 | HAS_USER_SITE = True |
27 | 30 | ||
28 | +libname = sys.lib | 31 | +libname = sys.lib |
29 | + | 32 | + |
30 | if sys.version < "2.2": | 33 | WINDOWS_SCHEME = { |
31 | WINDOWS_SCHEME = { | 34 | 'purelib': '$base/Lib/site-packages', |
32 | 'purelib': '$base', | 35 | 'platlib': '$base/Lib/site-packages', |
33 | @@ -45,7 +47,7 @@ | 36 | @@ -30,7 +32,7 @@ WINDOWS_SCHEME = { |
34 | INSTALL_SCHEMES = { | 37 | INSTALL_SCHEMES = { |
35 | 'unix_prefix': { | 38 | 'unix_prefix': { |
36 | 'purelib': '$base/lib/python$py_version_short/site-packages', | 39 | 'purelib': '$base/lib/python$py_version_short/site-packages', |
@@ -39,11 +42,11 @@ Index: Python-3.3.2/Lib/distutils/command/install.py | |||
39 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', | 42 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', |
40 | 'scripts': '$base/bin', | 43 | 'scripts': '$base/bin', |
41 | 'data' : '$base', | 44 | 'data' : '$base', |
42 | Index: Python-3.3.2/Lib/pydoc.py | 45 | Index: Python-3.4.2/Lib/pydoc.py |
43 | =================================================================== | 46 | =================================================================== |
44 | --- Python-3.3.2.orig/Lib/pydoc.py 2013-05-15 09:32:55.000000000 -0700 | 47 | --- Python-3.4.2.orig/Lib/pydoc.py |
45 | +++ Python-3.3.2/Lib/pydoc.py 2013-07-27 16:19:54.103877246 -0700 | 48 | +++ Python-3.4.2/Lib/pydoc.py |
46 | @@ -372,7 +372,7 @@ | 49 | @@ -394,7 +394,7 @@ class Doc: |
47 | 50 | ||
48 | docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) | 51 | docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) |
49 | 52 | ||
@@ -52,38 +55,11 @@ Index: Python-3.3.2/Lib/pydoc.py | |||
52 | "python%d.%d" % sys.version_info[:2]) | 55 | "python%d.%d" % sys.version_info[:2]) |
53 | if (isinstance(object, type(os)) and | 56 | if (isinstance(object, type(os)) and |
54 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 57 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
55 | Index: Python-3.3.2/Lib/site.py | 58 | Index: Python-3.4.2/Lib/trace.py |
56 | =================================================================== | ||
57 | --- Python-3.3.2.orig/Lib/site.py 2013-05-15 09:32:55.000000000 -0700 | ||
58 | +++ Python-3.3.2/Lib/site.py 2013-07-27 16:19:54.103877246 -0700 | ||
59 | @@ -303,13 +303,19 @@ | ||
60 | if sys.platform in ('os2emx', 'riscos'): | ||
61 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) | ||
62 | elif os.sep == '/': | ||
63 | - sitepackages.append(os.path.join(prefix, "lib", | ||
64 | + sitepackages.append(os.path.join(prefix, sys.lib, | ||
65 | "python" + sys.version[:3], | ||
66 | "site-packages")) | ||
67 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) | ||
68 | + if sys.lib != "lib": | ||
69 | + sitepackages.append(os.path.join(prefix, "lib", | ||
70 | + "python" + sys.version[:3], | ||
71 | + "site-packages")) | ||
72 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) | ||
73 | + if sys.lib != "lib": | ||
74 | + sitepackages.append(os.path.join(prefix, "lib", "site-python")) | ||
75 | else: | ||
76 | sitepackages.append(prefix) | ||
77 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) | ||
78 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) | ||
79 | if sys.platform == "darwin": | ||
80 | # for framework builds *only* we add the standard Apple | ||
81 | # locations. | ||
82 | Index: Python-3.3.2/Lib/trace.py | ||
83 | =================================================================== | 59 | =================================================================== |
84 | --- Python-3.3.2.orig/Lib/trace.py 2013-05-15 09:32:56.000000000 -0700 | 60 | --- Python-3.4.2.orig/Lib/trace.py |
85 | +++ Python-3.3.2/Lib/trace.py 2013-07-27 16:19:54.103877246 -0700 | 61 | +++ Python-3.4.2/Lib/trace.py |
86 | @@ -751,10 +751,10 @@ | 62 | @@ -751,10 +751,10 @@ def main(argv=None): |
87 | # should I also call expanduser? (after all, could use $HOME) | 63 | # should I also call expanduser? (after all, could use $HOME) |
88 | 64 | ||
89 | s = s.replace("$prefix", | 65 | s = s.replace("$prefix", |
@@ -96,11 +72,11 @@ Index: Python-3.3.2/Lib/trace.py | |||
96 | "python" + sys.version[:3])) | 72 | "python" + sys.version[:3])) |
97 | s = os.path.normpath(s) | 73 | s = os.path.normpath(s) |
98 | ignore_dirs.append(s) | 74 | ignore_dirs.append(s) |
99 | Index: Python-3.3.2/Makefile.pre.in | 75 | Index: Python-3.4.2/Makefile.pre.in |
100 | =================================================================== | 76 | =================================================================== |
101 | --- Python-3.3.2.orig/Makefile.pre.in 2013-07-27 16:19:16.000000000 -0700 | 77 | --- Python-3.4.2.orig/Makefile.pre.in |
102 | +++ Python-3.3.2/Makefile.pre.in 2013-07-27 16:19:54.103877246 -0700 | 78 | +++ Python-3.4.2/Makefile.pre.in |
103 | @@ -96,6 +96,8 @@ | 79 | @@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS |
104 | 80 | ||
105 | # Machine-dependent subdirectories | 81 | # Machine-dependent subdirectories |
106 | MACHDEP= @MACHDEP@ | 82 | MACHDEP= @MACHDEP@ |
@@ -109,7 +85,7 @@ Index: Python-3.3.2/Makefile.pre.in | |||
109 | 85 | ||
110 | # Multiarch directory (may be empty) | 86 | # Multiarch directory (may be empty) |
111 | MULTIARCH= @MULTIARCH@ | 87 | MULTIARCH= @MULTIARCH@ |
112 | @@ -115,7 +117,7 @@ | 88 | @@ -120,7 +122,7 @@ LIBDIR= @libdir@ |
113 | MANDIR= @mandir@ | 89 | MANDIR= @mandir@ |
114 | INCLUDEDIR= @includedir@ | 90 | INCLUDEDIR= @includedir@ |
115 | CONFINCLUDEDIR= $(exec_prefix)/include | 91 | CONFINCLUDEDIR= $(exec_prefix)/include |
@@ -118,7 +94,7 @@ Index: Python-3.3.2/Makefile.pre.in | |||
118 | ABIFLAGS= @ABIFLAGS@ | 94 | ABIFLAGS= @ABIFLAGS@ |
119 | 95 | ||
120 | # Detailed destination directories | 96 | # Detailed destination directories |
121 | @@ -635,6 +637,7 @@ | 97 | @@ -712,6 +714,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
122 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 98 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
123 | -DVERSION='"$(VERSION)"' \ | 99 | -DVERSION='"$(VERSION)"' \ |
124 | -DVPATH='"$(VPATH)"' \ | 100 | -DVPATH='"$(VPATH)"' \ |
@@ -126,7 +102,7 @@ Index: Python-3.3.2/Makefile.pre.in | |||
126 | -o $@ $(srcdir)/Modules/getpath.c | 102 | -o $@ $(srcdir)/Modules/getpath.c |
127 | 103 | ||
128 | Modules/python.o: $(srcdir)/Modules/python.c | 104 | Modules/python.o: $(srcdir)/Modules/python.c |
129 | @@ -701,7 +704,7 @@ | 105 | @@ -780,7 +783,7 @@ $(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN |
130 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) | 106 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
131 | 107 | ||
132 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 108 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -135,11 +111,11 @@ Index: Python-3.3.2/Makefile.pre.in | |||
135 | 111 | ||
136 | Python/importdl.o: $(srcdir)/Python/importdl.c | 112 | Python/importdl.o: $(srcdir)/Python/importdl.c |
137 | $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 113 | $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
138 | Index: Python-3.3.2/Modules/getpath.c | 114 | Index: Python-3.4.2/Modules/getpath.c |
139 | =================================================================== | 115 | =================================================================== |
140 | --- Python-3.3.2.orig/Modules/getpath.c 2013-05-15 09:32:59.000000000 -0700 | 116 | --- Python-3.4.2.orig/Modules/getpath.c |
141 | +++ Python-3.3.2/Modules/getpath.c 2013-07-27 16:19:54.107877246 -0700 | 117 | +++ Python-3.4.2/Modules/getpath.c |
142 | @@ -121,9 +121,11 @@ | 118 | @@ -117,9 +117,11 @@ |
143 | #define EXEC_PREFIX PREFIX | 119 | #define EXEC_PREFIX PREFIX |
144 | #endif | 120 | #endif |
145 | 121 | ||
@@ -153,20 +129,19 @@ Index: Python-3.3.2/Modules/getpath.c | |||
153 | #endif | 129 | #endif |
154 | 130 | ||
155 | #ifndef LANDMARK | 131 | #ifndef LANDMARK |
156 | @@ -135,7 +137,7 @@ | 132 | @@ -130,6 +132,7 @@ static wchar_t prefix[MAXPATHLEN+1]; |
133 | static wchar_t exec_prefix[MAXPATHLEN+1]; | ||
157 | static wchar_t progpath[MAXPATHLEN+1]; | 134 | static wchar_t progpath[MAXPATHLEN+1]; |
158 | static wchar_t *module_search_path = NULL; | 135 | static wchar_t *module_search_path = NULL; |
159 | static int module_search_path_malloced = 0; | ||
160 | -static wchar_t *lib_python = L"lib/python" VERSION; | ||
161 | +static wchar_t *lib_python = L"" LIB_PYTHON; | 136 | +static wchar_t *lib_python = L"" LIB_PYTHON; |
162 | 137 | ||
163 | static void | 138 | static void |
164 | reduce(wchar_t *dir) | 139 | reduce(wchar_t *dir) |
165 | Index: Python-3.3.2/Python/getplatform.c | 140 | Index: Python-3.4.2/Python/getplatform.c |
166 | =================================================================== | 141 | =================================================================== |
167 | --- Python-3.3.2.orig/Python/getplatform.c 2013-05-15 09:33:00.000000000 -0700 | 142 | --- Python-3.4.2.orig/Python/getplatform.c |
168 | +++ Python-3.3.2/Python/getplatform.c 2013-07-27 16:19:54.107877246 -0700 | 143 | +++ Python-3.4.2/Python/getplatform.c |
169 | @@ -10,3 +10,23 @@ | 144 | @@ -10,3 +10,23 @@ Py_GetPlatform(void) |
170 | { | 145 | { |
171 | return PLATFORM; | 146 | return PLATFORM; |
172 | } | 147 | } |
@@ -190,11 +165,11 @@ Index: Python-3.3.2/Python/getplatform.c | |||
190 | +{ | 165 | +{ |
191 | + return LIB; | 166 | + return LIB; |
192 | +} | 167 | +} |
193 | Index: Python-3.3.2/Python/sysmodule.c | 168 | Index: Python-3.4.2/Python/sysmodule.c |
194 | =================================================================== | 169 | =================================================================== |
195 | --- Python-3.3.2.orig/Python/sysmodule.c 2013-05-15 09:33:00.000000000 -0700 | 170 | --- Python-3.4.2.orig/Python/sysmodule.c |
196 | +++ Python-3.3.2/Python/sysmodule.c 2013-07-27 16:19:54.107877246 -0700 | 171 | +++ Python-3.4.2/Python/sysmodule.c |
197 | @@ -1612,6 +1612,10 @@ | 172 | @@ -1697,6 +1697,10 @@ _PySys_Init(void) |
198 | PyUnicode_FromString(Py_GetCopyright())); | 173 | PyUnicode_FromString(Py_GetCopyright())); |
199 | SET_SYS_FROM_STRING("platform", | 174 | SET_SYS_FROM_STRING("platform", |
200 | PyUnicode_FromString(Py_GetPlatform())); | 175 | PyUnicode_FromString(Py_GetPlatform())); |
@@ -205,11 +180,11 @@ Index: Python-3.3.2/Python/sysmodule.c | |||
205 | SET_SYS_FROM_STRING("executable", | 180 | SET_SYS_FROM_STRING("executable", |
206 | PyUnicode_FromWideChar( | 181 | PyUnicode_FromWideChar( |
207 | Py_GetProgramFullPath(), -1)); | 182 | Py_GetProgramFullPath(), -1)); |
208 | Index: Python-3.3.2/setup.py | 183 | Index: Python-3.4.2/setup.py |
209 | =================================================================== | 184 | =================================================================== |
210 | --- Python-3.3.2.orig/setup.py 2013-07-27 16:19:17.000000000 -0700 | 185 | --- Python-3.4.2.orig/setup.py |
211 | +++ Python-3.3.2/setup.py 2013-07-27 16:19:54.107877246 -0700 | 186 | +++ Python-3.4.2/setup.py |
212 | @@ -439,7 +439,7 @@ | 187 | @@ -454,7 +454,7 @@ class PyBuildExt(build_ext): |
213 | # directories (i.e. '.' and 'Include') must be first. See issue | 188 | # directories (i.e. '.' and 'Include') must be first. See issue |
214 | # 10520. | 189 | # 10520. |
215 | if not cross_compiling: | 190 | if not cross_compiling: |
@@ -218,7 +193,7 @@ Index: Python-3.3.2/setup.py | |||
218 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | 193 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
219 | # only change this for cross builds for 3.3, issues on Mageia | 194 | # only change this for cross builds for 3.3, issues on Mageia |
220 | if cross_compiling: | 195 | if cross_compiling: |
221 | @@ -497,8 +497,7 @@ | 196 | @@ -512,8 +512,7 @@ class PyBuildExt(build_ext): |
222 | # be assumed that no additional -I,-L directives are needed. | 197 | # be assumed that no additional -I,-L directives are needed. |
223 | if not cross_compiling: | 198 | if not cross_compiling: |
224 | lib_dirs = self.compiler.library_dirs + [ | 199 | lib_dirs = self.compiler.library_dirs + [ |
@@ -228,7 +203,7 @@ Index: Python-3.3.2/setup.py | |||
228 | ] | 203 | ] |
229 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] | 204 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] |
230 | else: | 205 | else: |
231 | @@ -675,11 +674,11 @@ | 206 | @@ -696,11 +695,11 @@ class PyBuildExt(build_ext): |
232 | elif curses_library: | 207 | elif curses_library: |
233 | readline_libs.append(curses_library) | 208 | readline_libs.append(curses_library) |
234 | elif self.compiler.find_library_file(lib_dirs + | 209 | elif self.compiler.find_library_file(lib_dirs + |
@@ -242,11 +217,11 @@ Index: Python-3.3.2/setup.py | |||
242 | extra_link_args=readline_extra_link_args, | 217 | extra_link_args=readline_extra_link_args, |
243 | libraries=readline_libs) ) | 218 | libraries=readline_libs) ) |
244 | else: | 219 | else: |
245 | Index: Python-3.3.2/Lib/sysconfig.py | 220 | Index: Python-3.4.2/Lib/sysconfig.py |
246 | =================================================================== | 221 | =================================================================== |
247 | --- Python-3.3.2.orig/Lib/sysconfig.py 2013-05-15 09:32:55.000000000 -0700 | 222 | --- Python-3.4.2.orig/Lib/sysconfig.py |
248 | +++ Python-3.3.2/Lib/sysconfig.py 2013-07-27 16:19:54.111877246 -0700 | 223 | +++ Python-3.4.2/Lib/sysconfig.py |
249 | @@ -21,10 +21,10 @@ | 224 | @@ -20,10 +20,10 @@ __all__ = [ |
250 | 225 | ||
251 | _INSTALL_SCHEMES = { | 226 | _INSTALL_SCHEMES = { |
252 | 'posix_prefix': { | 227 | 'posix_prefix': { |
@@ -260,7 +235,7 @@ Index: Python-3.3.2/Lib/sysconfig.py | |||
260 | 'include': | 235 | 'include': |
261 | '{installed_base}/include/python{py_version_short}{abiflags}', | 236 | '{installed_base}/include/python{py_version_short}{abiflags}', |
262 | 'platinclude': | 237 | 'platinclude': |
263 | @@ -33,10 +33,10 @@ | 238 | @@ -32,10 +32,10 @@ _INSTALL_SCHEMES = { |
264 | 'data': '{base}', | 239 | 'data': '{base}', |
265 | }, | 240 | }, |
266 | 'posix_home': { | 241 | 'posix_home': { |
@@ -274,7 +249,7 @@ Index: Python-3.3.2/Lib/sysconfig.py | |||
274 | 'include': '{installed_base}/include/python', | 249 | 'include': '{installed_base}/include/python', |
275 | 'platinclude': '{installed_base}/include/python', | 250 | 'platinclude': '{installed_base}/include/python', |
276 | 'scripts': '{base}/bin', | 251 | 'scripts': '{base}/bin', |
277 | @@ -81,10 +81,10 @@ | 252 | @@ -61,10 +61,10 @@ _INSTALL_SCHEMES = { |
278 | 'data': '{userbase}', | 253 | 'data': '{userbase}', |
279 | }, | 254 | }, |
280 | 'posix_user': { | 255 | 'posix_user': { |
@@ -288,11 +263,11 @@ Index: Python-3.3.2/Lib/sysconfig.py | |||
288 | 'include': '{userbase}/include/python{py_version_short}', | 263 | 'include': '{userbase}/include/python{py_version_short}', |
289 | 'scripts': '{userbase}/bin', | 264 | 'scripts': '{userbase}/bin', |
290 | 'data': '{userbase}', | 265 | 'data': '{userbase}', |
291 | Index: Python-3.3.2/configure.ac | 266 | Index: Python-3.4.2/configure.ac |
292 | =================================================================== | 267 | =================================================================== |
293 | --- Python-3.3.2.orig/configure.ac 2013-05-15 09:33:00.000000000 -0700 | 268 | --- Python-3.4.2.orig/configure.ac |
294 | +++ Python-3.3.2/configure.ac 2013-07-27 16:19:54.111877246 -0700 | 269 | +++ Python-3.4.2/configure.ac |
295 | @@ -769,6 +769,41 @@ | 270 | @@ -791,6 +791,41 @@ esac |
296 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) | 271 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) |
297 | AC_SUBST(MULTIARCH) | 272 | AC_SUBST(MULTIARCH) |
298 | 273 | ||
@@ -334,3 +309,30 @@ Index: Python-3.3.2/configure.ac | |||
334 | 309 | ||
335 | AC_SUBST(LIBRARY) | 310 | AC_SUBST(LIBRARY) |
336 | AC_MSG_CHECKING(LIBRARY) | 311 | AC_MSG_CHECKING(LIBRARY) |
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_3.3.3.bb b/meta/recipes-devtools/python/python3_3.4.2.bb index 6147408937..8bd69ed282 100644 --- a/meta/recipes-devtools/python/python3_3.3.3.bb +++ b/meta/recipes-devtools/python/python3_3.4.2.bb | |||
@@ -2,11 +2,11 @@ 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.3" | 5 | PYTHON_MAJMIN = "3.4" |
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 = "" |
9 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | 9 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ |
10 | file://12-distutils-prefix-is-inside-staging-area.patch \ | 10 | file://12-distutils-prefix-is-inside-staging-area.patch \ |
11 | file://python-config.patch \ | 11 | file://python-config.patch \ |
12 | file://000-cross-compile.patch \ | 12 | file://000-cross-compile.patch \ |
@@ -18,18 +18,14 @@ file://110-enable-zlib.patch \ | |||
18 | file://130-readline-setup.patch \ | 18 | file://130-readline-setup.patch \ |
19 | file://150-fix-setupterm.patch \ | 19 | file://150-fix-setupterm.patch \ |
20 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 20 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |
21 | file://fix-ast.h-dependency.patch \ | ||
22 | file://makerace.patch \ | 21 | file://makerace.patch \ |
23 | ${DISTRO_SRC_URI} \ | 22 | ${DISTRO_SRC_URI} \ |
24 | file://python3-fix-build-error-with-Readline-6.3.patch \ | ||
25 | " | 23 | " |
26 | 24 | ||
27 | SRC_URI += "\ | 25 | SRC_URI += "\ |
28 | file://03-fix-tkinter-detection.patch \ | 26 | file://03-fix-tkinter-detection.patch \ |
29 | file://04-default-is-optimized.patch \ | 27 | file://04-default-is-optimized.patch \ |
30 | file://avoid_warning_about_tkinter.patch \ | 28 | file://avoid_warning_about_tkinter.patch \ |
31 | file://06-ctypes-libffi-fix-configure.patch \ | ||
32 | file://remove_sqlite_rpath.patch \ | ||
33 | file://cgi_py.patch \ | 29 | file://cgi_py.patch \ |
34 | file://host_include_contamination.patch \ | 30 | file://host_include_contamination.patch \ |
35 | file://python-3.3-multilib.patch \ | 31 | file://python-3.3-multilib.patch \ |
@@ -42,10 +38,10 @@ SRC_URI += "\ | |||
42 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ | 38 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ |
43 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ | 39 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ |
44 | " | 40 | " |
45 | SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" | 41 | SRC_URI[md5sum] = "36fc7327c02c6f12fa24fc9ba78039e3" |
46 | SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb" | 42 | SRC_URI[sha256sum] = "1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def" |
47 | 43 | ||
48 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4eaea08eaaf6875189b0c49f26fa2005" | 44 | LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" |
49 | 45 | ||
50 | S = "${WORKDIR}/Python-${PV}" | 46 | S = "${WORKDIR}/Python-${PV}" |
51 | 47 | ||
@@ -75,9 +71,9 @@ export _PYTHON_PROJECT_SRC = "${S}" | |||
75 | # No ctypes option for python 3 | 71 | # No ctypes option for python 3 |
76 | PYTHONLSBOPTS = "" | 72 | PYTHONLSBOPTS = "" |
77 | 73 | ||
78 | do_configure_prepend() { | 74 | do_configure_append() { |
79 | rm -f ${S}/Makefile.orig | 75 | rm -f ${S}/Makefile.orig |
80 | autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf" | 76 | autoreconf -Wcross --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi |
81 | } | 77 | } |
82 | 78 | ||
83 | do_compile() { | 79 | do_compile() { |
@@ -170,7 +166,7 @@ do_install() { | |||
170 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} | 166 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} |
171 | fi | 167 | fi |
172 | 168 | ||
173 | oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h | 169 | oe_multilib_header python${PYTHON_BINABI}/pyconfig.h |
174 | } | 170 | } |
175 | 171 | ||
176 | do_install_append_class-nativesdk () { | 172 | do_install_append_class-nativesdk () { |
@@ -212,6 +208,7 @@ FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" | |||
212 | 208 | ||
213 | # catch all the rest (unsorted) | 209 | # catch all the rest (unsorted) |
214 | PACKAGES += "${PN}-misc" | 210 | PACKAGES += "${PN}-misc" |
211 | RDEPENDS_${PN}-misc += "${PN}-core" | ||
215 | FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" | 212 | FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" |
216 | 213 | ||
217 | # catch manpage | 214 | # catch manpage |