diff options
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 | 63 |
1 files changed, 29 insertions, 34 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 50d3915425..e4262d9ef0 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 | |||
@@ -11,72 +11,67 @@ Updated for python 2.7.3 | |||
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | 11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
12 | Date: 2012/05/01 | 12 | Date: 2012/05/01 |
13 | 13 | ||
14 | Index: Python-2.7.3/Lib/sysconfig.py | 14 | Rebased for python-2.7.9 |
15 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
16 | |||
17 | |||
18 | Index: Python-2.7.9/Lib/sysconfig.py | ||
15 | =================================================================== | 19 | =================================================================== |
16 | --- Python-2.7.3.orig/Lib/sysconfig.py | 20 | --- Python-2.7.9.orig/Lib/sysconfig.py |
17 | +++ Python-2.7.3/Lib/sysconfig.py | 21 | +++ Python-2.7.9/Lib/sysconfig.py |
18 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | 22 | @@ -9,7 +9,7 @@ _INSTALL_SCHEMES = { |
19 | |||
20 | _INSTALL_SCHEMES = { | ||
21 | 'posix_prefix': { | 23 | 'posix_prefix': { |
22 | - 'stdlib': '{base}/lib/python{py_version_short}', | 24 | 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', |
23 | - 'platstdlib': '{platbase}/lib/python{py_version_short}', | 25 | 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', |
24 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', | 26 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', |
25 | - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', | ||
26 | + 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', | ||
27 | + 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', | ||
28 | + 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages', | 27 | + 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages', |
29 | + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', | 28 | 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', |
30 | 'include': '{base}/include/python{py_version_short}', | 29 | 'include': '{base}/include/python{py_version_short}', |
31 | 'platinclude': '{platbase}/include/python{py_version_short}', | 30 | 'platinclude': '{platbase}/include/python{py_version_short}', |
32 | 'scripts': '{base}/bin', | 31 | @@ -67,7 +67,7 @@ _INSTALL_SCHEMES = { |
33 | @@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { | ||
34 | 'data' : '{userbase}', | ||
35 | }, | ||
36 | 'posix_user': { | 32 | 'posix_user': { |
37 | - 'stdlib': '{userbase}/lib/python{py_version_short}', | 33 | 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', |
38 | - 'platstdlib': '{userbase}/lib/python{py_version_short}', | 34 | 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', |
39 | - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', | 35 | - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', |
40 | - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
41 | + 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
42 | + 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
43 | + 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | 36 | + 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', |
44 | + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | 37 | 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', |
45 | 'include': '{userbase}/include/python{py_version_short}', | 38 | 'include': '{userbase}/include/python{py_version_short}', |
46 | 'scripts': '{userbase}/bin', | 39 | 'scripts': '{userbase}/bin', |
47 | 'data' : '{userbase}', | 40 | Index: Python-2.7.9/Makefile.pre.in |
48 | Index: Python-2.7.3/Makefile.pre.in | ||
49 | =================================================================== | 41 | =================================================================== |
50 | --- Python-2.7.3.orig/Makefile.pre.in | 42 | --- Python-2.7.9.orig/Makefile.pre.in |
51 | +++ Python-2.7.3/Makefile.pre.in | 43 | +++ Python-2.7.9/Makefile.pre.in |
52 | @@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL | 44 | @@ -1046,27 +1046,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL |
53 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ | 45 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ |
54 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | 46 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ |
55 | fi | 47 | fi |
56 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 48 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
57 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 49 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
58 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 50 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
59 | -d $(LIBDEST) -f \ | 51 | -d $(LIBDEST) -f \ |
60 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 52 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
61 | $(DESTDIR)$(LIBDEST) | 53 | $(DESTDIR)$(LIBDEST) |
62 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 54 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
63 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 55 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \ |
64 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 56 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
65 | -d $(LIBDEST) -f \ | 57 | -d $(LIBDEST) -f \ |
66 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 58 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
67 | $(DESTDIR)$(LIBDEST) | 59 | $(DESTDIR)$(LIBDEST) |
68 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 60 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
69 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 61 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
70 | $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ | 62 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
71 | -d $(LIBDEST)/site-packages -f \ | 63 | -d $(LIBDEST)/site-packages -f \ |
72 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 64 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
73 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 65 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
74 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 66 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
75 | $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 67 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
76 | -d $(LIBDEST)/site-packages -f \ | 68 | -d $(LIBDEST)/site-packages -f \ |
77 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 69 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
78 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 70 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
79 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 71 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
80 | $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" | 72 | $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt |
73 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
74 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
75 | $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt | ||
81 | 76 | ||
82 | # Create the PLATDIR source directory, if one wasn't distributed.. | 77 | # Create the PLATDIR source directory, if one wasn't distributed.. |