summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
diff options
context:
space:
mode:
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.patch14
1 files changed, 7 insertions, 7 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 b4e72193ff..d41b6cfc74 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
@@ -41,37 +41,37 @@ Index: Python-2.7.9/Makefile.pre.in
41=================================================================== 41===================================================================
42--- Python-2.7.9.orig/Makefile.pre.in 42--- Python-2.7.9.orig/Makefile.pre.in
43+++ Python-2.7.9/Makefile.pre.in 43+++ Python-2.7.9/Makefile.pre.in
44@@ -1046,27 +1046,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL 44@@ -1037,27 +1037,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL
45 $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ 45 $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
46 $(DESTDIR)$(LIBDEST)/distutils/tests ; \ 46 $(DESTDIR)$(LIBDEST)/distutils/tests ; \
47 fi 47 fi
48- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 48- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
49+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 49+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
50 $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ 50 $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
51 -d $(LIBDEST) -f \ 51 -d $(LIBDEST) -f \
52 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ 52 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
53 $(DESTDIR)$(LIBDEST) 53 $(DESTDIR)$(LIBDEST)
54- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 54- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
55+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 55+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
56 $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ 56 $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
57 -d $(LIBDEST) -f \ 57 -d $(LIBDEST) -f \
58 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ 58 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
59 $(DESTDIR)$(LIBDEST) 59 $(DESTDIR)$(LIBDEST)
60- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 60- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
61+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 61+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
62 $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ 62 $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
63 -d $(LIBDEST)/site-packages -f \ 63 -d $(LIBDEST)/site-packages -f \
64 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 64 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
65- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 65- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
66+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 66+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
67 $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ 67 $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
68 -d $(LIBDEST)/site-packages -f \ 68 -d $(LIBDEST)/site-packages -f \
69 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 69 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
70- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 70- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
71+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 71+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
72 $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt 72 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
73- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 73- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
74+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 74+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
75 $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt 75 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
76 76
77 # Create the PLATDIR source directory, if one wasn't distributed.. 77 # Create the PLATDIR source directory, if one wasn't distributed..