diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-01 10:23:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:48:04 +0100 |
commit | 7b08f6a9a11c76aa6b0910feb49accae5db25de3 (patch) | |
tree | d5333890dd7a553eef6b8a32a16e5ff446fb4fbb /meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | |
parent | 4f4ab8bfe33283105112e81ee242a2e72527dd18 (diff) | |
download | poky-7b08f6a9a11c76aa6b0910feb49accae5db25de3.tar.gz |
python: upgrade from 2.7.2 to 2.7.3
bin/python2 link is provided by the python install process,
so no need to create it.
rebase these patches to the newer code:
fix_for_using_different_libdir.patch
04-default-is-optimized.patch
remove this patch as it is upstream now:
sys_platform_is_now_always_linux2.patch
Change default python version to 2.7.3 in the distro config
(From OE-Core rev: 5d92a95ea9b480235b7c9ca5949a681376eba725)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch index e8f19a24d8..50d3915425 100644 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | |||
@@ -7,10 +7,14 @@ in the install process of the host python. | |||
7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | 7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
8 | Date: 2012/03/14 | 8 | Date: 2012/03/14 |
9 | 9 | ||
10 | Index: Python-2.7.2/Lib/sysconfig.py | 10 | Updated for python 2.7.3 |
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | Date: 2012/05/01 | ||
13 | |||
14 | Index: Python-2.7.3/Lib/sysconfig.py | ||
11 | =================================================================== | 15 | =================================================================== |
12 | --- Python-2.7.2.orig/Lib/sysconfig.py | 16 | --- Python-2.7.3.orig/Lib/sysconfig.py |
13 | +++ Python-2.7.2/Lib/sysconfig.py | 17 | +++ Python-2.7.3/Lib/sysconfig.py |
14 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | 18 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath |
15 | 19 | ||
16 | _INSTALL_SCHEMES = { | 20 | _INSTALL_SCHEMES = { |
@@ -41,14 +45,14 @@ Index: Python-2.7.2/Lib/sysconfig.py | |||
41 | 'include': '{userbase}/include/python{py_version_short}', | 45 | 'include': '{userbase}/include/python{py_version_short}', |
42 | 'scripts': '{userbase}/bin', | 46 | 'scripts': '{userbase}/bin', |
43 | 'data' : '{userbase}', | 47 | 'data' : '{userbase}', |
44 | Index: Python-2.7.2/Makefile.pre.in | 48 | Index: Python-2.7.3/Makefile.pre.in |
45 | =================================================================== | 49 | =================================================================== |
46 | --- Python-2.7.2.orig/Makefile.pre.in | 50 | --- Python-2.7.3.orig/Makefile.pre.in |
47 | +++ Python-2.7.2/Makefile.pre.in | 51 | +++ Python-2.7.3/Makefile.pre.in |
48 | @@ -928,25 +928,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL | 52 | @@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL |
49 | done; \ | 53 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ |
50 | done | 54 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ |
51 | $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt | 55 | fi |
52 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 56 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
53 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 57 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
54 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 58 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
@@ -56,7 +60,7 @@ Index: Python-2.7.2/Makefile.pre.in | |||
56 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 60 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
57 | $(DESTDIR)$(LIBDEST) | 61 | $(DESTDIR)$(LIBDEST) |
58 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 62 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
59 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 63 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
60 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 64 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
61 | -d $(LIBDEST) -f \ | 65 | -d $(LIBDEST) -f \ |
62 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 66 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
@@ -67,12 +71,12 @@ Index: Python-2.7.2/Makefile.pre.in | |||
67 | -d $(LIBDEST)/site-packages -f \ | 71 | -d $(LIBDEST)/site-packages -f \ |
68 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 72 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
69 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 73 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
70 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 74 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
71 | $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 75 | $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
72 | -d $(LIBDEST)/site-packages -f \ | 76 | -d $(LIBDEST)/site-packages -f \ |
73 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 77 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
74 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 78 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
75 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 79 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
76 | $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" | 80 | $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" |
77 | 81 | ||
78 | # Create the PLATDIR source directory, if one wasn't distributed.. | 82 | # Create the PLATDIR source directory, if one wasn't distributed.. |