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 | 32 |
1 files changed, 16 insertions, 16 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 e89faa4fb0..e091431ab2 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 | |||
@@ -2,10 +2,10 @@ | |||
2 | # built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. | 2 | # built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. |
3 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> | 3 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> |
4 | 4 | ||
5 | Index: Python-2.6.1/Makefile.pre.in | 5 | Index: Python-2.6.6/Makefile.pre.in |
6 | =================================================================== | 6 | =================================================================== |
7 | --- Python-2.6.1.orig/Makefile.pre.in | 7 | --- Python-2.6.6.orig/Makefile.pre.in |
8 | +++ Python-2.6.1/Makefile.pre.in | 8 | +++ Python-2.6.6/Makefile.pre.in |
9 | @@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ | 9 | @@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ |
10 | 10 | ||
11 | PYTHON= python$(EXE) | 11 | PYTHON= python$(EXE) |
@@ -27,14 +27,14 @@ Index: Python-2.6.1/Makefile.pre.in | |||
27 | # Build the shared modules | 27 | # Build the shared modules |
28 | sharedmods: $(BUILDPYTHON) | 28 | sharedmods: $(BUILDPYTHON) |
29 | @case $$MAKEFLAGS in \ | 29 | @case $$MAKEFLAGS in \ |
30 | - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ | 30 | - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ |
31 | - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ | 31 | - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ |
32 | + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ | 32 | + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ |
33 | + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ | 33 | + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ |
34 | esac | 34 | esac |
35 | 35 | ||
36 | # Build static library | 36 | # Build static library |
37 | @@ -513,7 +514,7 @@ Modules/python.o: $(srcdir)/Modules/pyth | 37 | @@ -517,7 +518,7 @@ Modules/python.o: $(srcdir)/Modules/pyth |
38 | 38 | ||
39 | $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) | 39 | $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) |
40 | -@$(INSTALL) -d Include | 40 | -@$(INSTALL) -d Include |
@@ -43,7 +43,7 @@ Index: Python-2.6.1/Makefile.pre.in | |||
43 | 43 | ||
44 | $(PGEN): $(PGENOBJS) | 44 | $(PGEN): $(PGENOBJS) |
45 | $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) | 45 | $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) |
46 | @@ -879,23 +880,23 @@ libinstall: build_all $(srcdir)/Lib/$(PL | 46 | @@ -887,23 +888,23 @@ libinstall: build_all $(srcdir)/Lib/$(PL |
47 | done | 47 | done |
48 | $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt | 48 | $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt |
49 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 49 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
@@ -72,7 +72,7 @@ Index: Python-2.6.1/Makefile.pre.in | |||
72 | 72 | ||
73 | # Create the PLATDIR source directory, if one wasn't distributed.. | 73 | # Create the PLATDIR source directory, if one wasn't distributed.. |
74 | $(srcdir)/Lib/$(PLATDIR): | 74 | $(srcdir)/Lib/$(PLATDIR): |
75 | @@ -993,7 +994,7 @@ libainstall: all | 75 | @@ -1001,7 +1002,7 @@ libainstall: all |
76 | # Install the dynamically loadable modules | 76 | # Install the dynamically loadable modules |
77 | # This goes into $(exec_prefix) | 77 | # This goes into $(exec_prefix) |
78 | sharedinstall: | 78 | sharedinstall: |
@@ -81,11 +81,11 @@ Index: Python-2.6.1/Makefile.pre.in | |||
81 | --prefix=$(prefix) \ | 81 | --prefix=$(prefix) \ |
82 | --install-scripts=$(BINDIR) \ | 82 | --install-scripts=$(BINDIR) \ |
83 | --install-platlib=$(DESTSHARED) \ | 83 | --install-platlib=$(DESTSHARED) \ |
84 | Index: Python-2.6.1/setup.py | 84 | Index: Python-2.6.6/setup.py |
85 | =================================================================== | 85 | =================================================================== |
86 | --- Python-2.6.1.orig/setup.py | 86 | --- Python-2.6.6.orig/setup.py |
87 | +++ Python-2.6.1/setup.py | 87 | +++ Python-2.6.6/setup.py |
88 | @@ -276,6 +276,7 @@ class PyBuildExt(build_ext): | 88 | @@ -322,6 +322,7 @@ class PyBuildExt(build_ext): |
89 | self.failed.append(ext.name) | 89 | self.failed.append(ext.name) |
90 | self.announce('*** WARNING: renaming "%s" since importing it' | 90 | self.announce('*** WARNING: renaming "%s" since importing it' |
91 | ' failed: %s' % (ext.name, why), level=3) | 91 | ' failed: %s' % (ext.name, why), level=3) |
@@ -93,7 +93,7 @@ Index: Python-2.6.1/setup.py | |||
93 | assert not self.inplace | 93 | assert not self.inplace |
94 | basename, tail = os.path.splitext(ext_filename) | 94 | basename, tail = os.path.splitext(ext_filename) |
95 | newname = basename + "_failed" + tail | 95 | newname = basename + "_failed" + tail |
96 | @@ -310,8 +311,8 @@ class PyBuildExt(build_ext): | 96 | @@ -356,8 +357,8 @@ class PyBuildExt(build_ext): |
97 | 97 | ||
98 | def detect_modules(self): | 98 | def detect_modules(self): |
99 | # Ensure that /usr/local is always used | 99 | # Ensure that /usr/local is always used |
@@ -104,7 +104,7 @@ Index: Python-2.6.1/setup.py | |||
104 | 104 | ||
105 | # Add paths specified in the environment variables LDFLAGS and | 105 | # Add paths specified in the environment variables LDFLAGS and |
106 | # CPPFLAGS for header and library files. | 106 | # CPPFLAGS for header and library files. |
107 | @@ -410,6 +411,9 @@ class PyBuildExt(build_ext): | 107 | @@ -456,6 +457,9 @@ class PyBuildExt(build_ext): |
108 | 108 | ||
109 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules | 109 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules |
110 | 110 | ||