83 lines
3.9 KiB
Diff
83 lines
3.9 KiB
Diff
Upstream-Status: Inappropriate [Embedded specific]
|
|
|
|
This patch fixes issuing with different libdir like lib64.
|
|
This patch makes the native python binary modules findable
|
|
in the install process of the host python.
|
|
|
|
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
|
Date: 2012/03/14
|
|
|
|
Updated for python 2.7.3
|
|
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
|
Date: 2012/05/01
|
|
|
|
Index: Python-2.7.3/Lib/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.3.orig/Lib/sysconfig.py
|
|
+++ Python-2.7.3/Lib/sysconfig.py
|
|
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
|
|
|
|
_INSTALL_SCHEMES = {
|
|
'posix_prefix': {
|
|
- 'stdlib': '{base}/lib/python{py_version_short}',
|
|
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
|
|
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
|
|
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}',
|
|
+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
|
|
+ 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
|
|
'include': '{base}/include/python{py_version_short}',
|
|
'platinclude': '{platbase}/include/python{py_version_short}',
|
|
'scripts': '{base}/bin',
|
|
@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = {
|
|
'data' : '{userbase}',
|
|
},
|
|
'posix_user': {
|
|
- 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
|
|
+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
|
|
+ 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
|
|
'include': '{userbase}/include/python{py_version_short}',
|
|
'scripts': '{userbase}/bin',
|
|
'data' : '{userbase}',
|
|
Index: Python-2.7.3/Makefile.pre.in
|
|
===================================================================
|
|
--- Python-2.7.3.orig/Makefile.pre.in
|
|
+++ Python-2.7.3/Makefile.pre.in
|
|
@@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
|
|
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
|
|
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
|
|
fi
|
|
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
|
$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
|
|
-d $(LIBDEST) -f \
|
|
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
|
$(DESTDIR)$(LIBDEST)
|
|
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
|
$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
|
-d $(LIBDEST) -f \
|
|
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
|
$(DESTDIR)$(LIBDEST)
|
|
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
|
$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
|
|
-d $(LIBDEST)/site-packages -f \
|
|
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
|
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
|
$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
|
-d $(LIBDEST)/site-packages -f \
|
|
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
|
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
|
$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
|
|
|
|
# Create the PLATDIR source directory, if one wasn't distributed..
|