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 | 82 |
1 files changed, 82 insertions, 0 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 new file mode 100644 index 0000000000..50d3915425 --- /dev/null +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | |||
| @@ -0,0 +1,82 @@ | |||
| 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 | Index: Python-2.7.3/Lib/sysconfig.py | ||
| 15 | =================================================================== | ||
| 16 | --- Python-2.7.3.orig/Lib/sysconfig.py | ||
| 17 | +++ Python-2.7.3/Lib/sysconfig.py | ||
| 18 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | ||
| 19 | |||
| 20 | _INSTALL_SCHEMES = { | ||
| 21 | 'posix_prefix': { | ||
| 22 | - 'stdlib': '{base}/lib/python{py_version_short}', | ||
| 23 | - 'platstdlib': '{platbase}/lib/python{py_version_short}', | ||
| 24 | - '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', | ||
| 29 | + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
| 30 | 'include': '{base}/include/python{py_version_short}', | ||
| 31 | 'platinclude': '{platbase}/include/python{py_version_short}', | ||
| 32 | 'scripts': '{base}/bin', | ||
| 33 | @@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { | ||
| 34 | 'data' : '{userbase}', | ||
| 35 | }, | ||
| 36 | 'posix_user': { | ||
| 37 | - 'stdlib': '{userbase}/lib/python{py_version_short}', | ||
| 38 | - 'platstdlib': '{userbase}/lib/python{py_version_short}', | ||
| 39 | - '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', | ||
| 44 | + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
| 45 | 'include': '{userbase}/include/python{py_version_short}', | ||
| 46 | 'scripts': '{userbase}/bin', | ||
| 47 | 'data' : '{userbase}', | ||
| 48 | Index: Python-2.7.3/Makefile.pre.in | ||
| 49 | =================================================================== | ||
| 50 | --- Python-2.7.3.orig/Makefile.pre.in | ||
| 51 | +++ Python-2.7.3/Makefile.pre.in | ||
| 52 | @@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL | ||
| 53 | $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ | ||
| 54 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | ||
| 55 | fi | ||
| 56 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
| 57 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
| 58 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
| 59 | -d $(LIBDEST) -f \ | ||
| 60 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
| 61 | $(DESTDIR)$(LIBDEST) | ||
| 62 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
| 63 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
| 64 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
| 65 | -d $(LIBDEST) -f \ | ||
| 66 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
| 67 | $(DESTDIR)$(LIBDEST) | ||
| 68 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
| 69 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
| 70 | $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
| 71 | -d $(LIBDEST)/site-packages -f \ | ||
| 72 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
| 73 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
| 74 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
| 75 | $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
| 76 | -d $(LIBDEST)/site-packages -f \ | ||
| 77 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
| 78 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
| 79 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | ||
| 80 | $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" | ||
| 81 | |||
| 82 | # Create the PLATDIR source directory, if one wasn't distributed.. | ||