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 | 77 |
1 files changed, 0 insertions, 77 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 deleted file mode 100644 index d41b6cfc74..0000000000 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [Embedded specific] | ||
2 | |||
3 | This patch fixes issuing with different libdir like lib64. | ||
4 | This patch makes the native python binary modules findable | ||
5 | in the install process of the host python. | ||
6 | |||
7 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
8 | Date: 2012/03/14 | ||
9 | |||
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 | 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 | ||
19 | =================================================================== | ||
20 | --- Python-2.7.9.orig/Lib/sysconfig.py | ||
21 | +++ Python-2.7.9/Lib/sysconfig.py | ||
22 | @@ -9,7 +9,7 @@ _INSTALL_SCHEMES = { | ||
23 | 'posix_prefix': { | ||
24 | 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', | ||
25 | 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', | ||
26 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', | ||
27 | + 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
28 | 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
29 | 'include': '{base}/include/python{py_version_short}', | ||
30 | 'platinclude': '{platbase}/include/python{py_version_short}', | ||
31 | @@ -67,7 +67,7 @@ _INSTALL_SCHEMES = { | ||
32 | 'posix_user': { | ||
33 | 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
34 | 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
35 | - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
36 | + 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
37 | 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
38 | 'include': '{userbase}/include/python{py_version_short}', | ||
39 | 'scripts': '{userbase}/bin', | ||
40 | Index: Python-2.7.9/Makefile.pre.in | ||
41 | =================================================================== | ||
42 | --- Python-2.7.9.orig/Makefile.pre.in | ||
43 | +++ Python-2.7.9/Makefile.pre.in | ||
44 | @@ -1037,27 +1037,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL | ||
45 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ | ||
46 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | ||
47 | fi | ||
48 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
49 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
50 | $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
51 | -d $(LIBDEST) -f \ | ||
52 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
53 | $(DESTDIR)$(LIBDEST) | ||
54 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
55 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
56 | $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
57 | -d $(LIBDEST) -f \ | ||
58 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
59 | $(DESTDIR)$(LIBDEST) | ||
60 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
61 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
62 | $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
63 | -d $(LIBDEST)/site-packages -f \ | ||
64 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
65 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
66 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
67 | $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
68 | -d $(LIBDEST)/site-packages -f \ | ||
69 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
70 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
71 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
72 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt | ||
73 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
74 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
75 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt | ||
76 | |||
77 | # Create the PLATDIR source directory, if one wasn't distributed.. | ||