diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index b2a8c3b5a3..366ce3e400 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch | |||
@@ -9,11 +9,11 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
9 | Rebased for python-2.7.9 | 9 | Rebased for python-2.7.9 |
10 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 10 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
11 | 11 | ||
12 | Index: Python-2.7.12/Makefile.pre.in | 12 | Index: Python-2.7.13/Makefile.pre.in |
13 | =================================================================== | 13 | =================================================================== |
14 | --- Python-2.7.12.orig/Makefile.pre.in | 14 | --- Python-2.7.13.orig/Makefile.pre.in |
15 | +++ Python-2.7.12/Makefile.pre.in | 15 | +++ Python-2.7.13/Makefile.pre.in |
16 | @@ -246,6 +246,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ | 16 | @@ -245,6 +245,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ |
17 | ########################################################################## | 17 | ########################################################################## |
18 | # Parser | 18 | # Parser |
19 | PGEN= Parser/pgen$(EXE) | 19 | PGEN= Parser/pgen$(EXE) |
@@ -21,7 +21,7 @@ Index: Python-2.7.12/Makefile.pre.in | |||
21 | 21 | ||
22 | PSRCS= \ | 22 | PSRCS= \ |
23 | Parser/acceler.c \ | 23 | Parser/acceler.c \ |
24 | @@ -513,7 +514,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA | 24 | @@ -512,7 +513,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA |
25 | $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | 25 | $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) |
26 | 26 | ||
27 | platform: $(BUILDPYTHON) pybuilddir.txt | 27 | platform: $(BUILDPYTHON) pybuilddir.txt |
@@ -30,16 +30,16 @@ Index: Python-2.7.12/Makefile.pre.in | |||
30 | 30 | ||
31 | # Create build directory and generate the sysconfig build-time data there. | 31 | # Create build directory and generate the sysconfig build-time data there. |
32 | # pybuilddir.txt contains the name of the build dir and is used for | 32 | # pybuilddir.txt contains the name of the build dir and is used for |
33 | @@ -684,7 +685,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) | 33 | @@ -681,7 +682,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p |
34 | |||
35 | $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN) | ||
34 | @$(MKDIR_P) Include | 36 | @$(MKDIR_P) Include |
35 | # Avoid copying the file onto itself for an in-tree build | 37 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
36 | if test "$(cross_compiling)" != "yes"; then \ | 38 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
37 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ | 39 | $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H) |
38 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ | 40 | touch $(GRAMMAR_C) |
39 | else \ | 41 | |
40 | cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \ | 42 | @@ -1121,27 +1122,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL |
41 | mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \ | ||
42 | @@ -1133,27 +1134,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL | ||
43 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | 43 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ |
44 | fi | 44 | fi |
45 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 45 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
@@ -73,10 +73,10 @@ Index: Python-2.7.12/Makefile.pre.in | |||
73 | 73 | ||
74 | # Create the PLATDIR source directory, if one wasn't distributed.. | 74 | # Create the PLATDIR source directory, if one wasn't distributed.. |
75 | $(srcdir)/Lib/$(PLATDIR): | 75 | $(srcdir)/Lib/$(PLATDIR): |
76 | Index: Python-2.7.12/setup.py | 76 | Index: Python-2.7.13/setup.py |
77 | =================================================================== | 77 | =================================================================== |
78 | --- Python-2.7.12.orig/setup.py | 78 | --- Python-2.7.13.orig/setup.py |
79 | +++ Python-2.7.12/setup.py | 79 | +++ Python-2.7.13/setup.py |
80 | @@ -350,6 +350,7 @@ class PyBuildExt(build_ext): | 80 | @@ -350,6 +350,7 @@ class PyBuildExt(build_ext): |
81 | self.failed.append(ext.name) | 81 | self.failed.append(ext.name) |
82 | self.announce('*** WARNING: renaming "%s" since importing it' | 82 | self.announce('*** WARNING: renaming "%s" since importing it' |