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 | 42 |
1 files changed, 22 insertions, 20 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 1257ca6557..235484709a 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,13 @@ 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.9/Makefile.pre.in | 12 | Rebased for python-2.7.12 |
13 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
14 | Index: Python-2.7.12/Makefile.pre.in | ||
13 | =================================================================== | 15 | =================================================================== |
14 | --- Python-2.7.9.orig/Makefile.pre.in | 16 | --- Python-2.7.12.orig/Makefile.pre.in |
15 | +++ Python-2.7.9/Makefile.pre.in | 17 | +++ Python-2.7.12/Makefile.pre.in |
16 | @@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ | 18 | @@ -246,6 +246,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ |
17 | ########################################################################## | 19 | ########################################################################## |
18 | # Parser | 20 | # Parser |
19 | PGEN= Parser/pgen$(EXE) | 21 | PGEN= Parser/pgen$(EXE) |
@@ -21,7 +23,7 @@ Index: Python-2.7.9/Makefile.pre.in | |||
21 | 23 | ||
22 | PSRCS= \ | 24 | PSRCS= \ |
23 | Parser/acceler.c \ | 25 | Parser/acceler.c \ |
24 | @@ -445,7 +446,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA | 26 | @@ -513,7 +514,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA |
25 | $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | 27 | $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) |
26 | 28 | ||
27 | platform: $(BUILDPYTHON) pybuilddir.txt | 29 | platform: $(BUILDPYTHON) pybuilddir.txt |
@@ -30,16 +32,16 @@ Index: Python-2.7.9/Makefile.pre.in | |||
30 | 32 | ||
31 | # Create build directory and generate the sysconfig build-time data there. | 33 | # 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 | 34 | # pybuilddir.txt contains the name of the build dir and is used for |
33 | @@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p | 35 | @@ -684,7 +685,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) |
34 | $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) | 36 | @$(MKDIR_P) Include |
35 | @$(MKDIR_P) Include | 37 | # Avoid copying the file onto itself for an in-tree build |
36 | $(MAKE) $(PGEN) | 38 | if test "$(cross_compiling)" != "yes"; then \ |
37 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 39 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ |
38 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 40 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ |
39 | $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) | 41 | else \ |
40 | $(MAKE) $(GRAMMAR_H) | 42 | cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \ |
41 | touch $(GRAMMAR_C) | 43 | mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \ |
42 | @@ -1043,27 +1044,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL | 44 | @@ -1133,27 +1134,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL |
43 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ | 45 | $(DESTDIR)$(LIBDEST)/distutils/tests ; \ |
44 | fi | 46 | fi |
45 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 47 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
@@ -73,11 +75,11 @@ Index: Python-2.7.9/Makefile.pre.in | |||
73 | 75 | ||
74 | # Create the PLATDIR source directory, if one wasn't distributed.. | 76 | # Create the PLATDIR source directory, if one wasn't distributed.. |
75 | $(srcdir)/Lib/$(PLATDIR): | 77 | $(srcdir)/Lib/$(PLATDIR): |
76 | Index: Python-2.7.9/setup.py | 78 | Index: Python-2.7.12/setup.py |
77 | =================================================================== | 79 | =================================================================== |
78 | --- Python-2.7.9.orig/setup.py | 80 | --- Python-2.7.12.orig/setup.py |
79 | +++ Python-2.7.9/setup.py | 81 | +++ Python-2.7.12/setup.py |
80 | @@ -334,6 +334,7 @@ class PyBuildExt(build_ext): | 82 | @@ -350,6 +350,7 @@ class PyBuildExt(build_ext): |
81 | self.failed.append(ext.name) | 83 | self.failed.append(ext.name) |
82 | self.announce('*** WARNING: renaming "%s" since importing it' | 84 | self.announce('*** WARNING: renaming "%s" since importing it' |
83 | ' failed: %s' % (ext.name, why), level=3) | 85 | ' failed: %s' % (ext.name, why), level=3) |
@@ -85,7 +87,7 @@ Index: Python-2.7.9/setup.py | |||
85 | assert not self.inplace | 87 | assert not self.inplace |
86 | basename, tail = os.path.splitext(ext_filename) | 88 | basename, tail = os.path.splitext(ext_filename) |
87 | newname = basename + "_failed" + tail | 89 | newname = basename + "_failed" + tail |
88 | @@ -558,6 +559,9 @@ class PyBuildExt(build_ext): | 90 | @@ -574,6 +575,9 @@ class PyBuildExt(build_ext): |
89 | 91 | ||
90 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules | 92 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules |
91 | 93 | ||