summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-08-03 20:27:08 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-08-04 00:08:30 +0200
commit299d6c27f184252c74094cfc6e2df697ae63b466 (patch)
tree171c519aa32fc21d6f1077d3bbc254534272288a
parent54a3085b6ff627516a4d4b4be7e278c0aad30878 (diff)
downloadptxdist-299d6c27f184252c74094cfc6e2df697ae63b466.tar.gz
ptxdist-299d6c27f184252c74094cfc6e2df697ae63b466.tar.xz
python: build on Linux 3.x host
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/Python-2.6.6/0019-dont-call-cross-python.patch23
-rw-r--r--patches/Python-2.6.6/0019-python-don-t-call-cross-python.patch22
-rw-r--r--patches/Python-2.6.6/series3
-rw-r--r--rules/python.make3
4 files changed, 4 insertions, 47 deletions
diff --git a/patches/Python-2.6.6/0019-dont-call-cross-python.patch b/patches/Python-2.6.6/0019-dont-call-cross-python.patch
deleted file mode 100644
index ac61cd78e..000000000
--- a/patches/Python-2.6.6/0019-dont-call-cross-python.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Thu Jul 21 12:29:58 CEST 2011
-Subject: [PATCH] python: don't call cross python
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- Makefile.pre.in | 2 +-
- configure.in | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: Python-2.6.6/Makefile.pre.in
-===================================================================
---- Python-2.6.6.orig/Makefile.pre.in
-+++ Python-2.6.6/Makefile.pre.in
-@@ -918,7 +918,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
- $(srcdir)/Lib/$(PLATDIR):
- mkdir $(srcdir)/Lib/$(PLATDIR)
- cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
-- export PATH; PATH="`pwd`:$$PATH"; \
-+ export PATH; \
- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
- export EXE; EXE="$(BUILDEXE)"; \
diff --git a/patches/Python-2.6.6/0019-python-don-t-call-cross-python.patch b/patches/Python-2.6.6/0019-python-don-t-call-cross-python.patch
deleted file mode 100644
index fba6ea36b..000000000
--- a/patches/Python-2.6.6/0019-python-don-t-call-cross-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Thu, 21 Jul 2011 12:29:58 +0200
-Subject: [PATCH] python: don't call cross python
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- Makefile.pre.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8b6a6b4..40f64e1 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -918,7 +918,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
- $(srcdir)/Lib/$(PLATDIR):
- mkdir $(srcdir)/Lib/$(PLATDIR)
- cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
-- export PATH; PATH="`pwd`:$$PATH"; \
-+ export PATH; \
- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
- export EXE; EXE="$(BUILDEXE)"; \
diff --git a/patches/Python-2.6.6/series b/patches/Python-2.6.6/series
index 908ee4502..c84030fbc 100644
--- a/patches/Python-2.6.6/series
+++ b/patches/Python-2.6.6/series
@@ -18,5 +18,4 @@
0016-python-fix-long-long-autoconf-test.patch
0017-python-don-t-add-rpaths-in-setup.py.patch
0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
-0019-python-don-t-call-cross-python.patch
-# 37771ea7224779995d66f92208a8f093 - git-ptx-patches magic
+# e4b2d0366f87ef051c7b5151c479533e - git-ptx-patches magic
diff --git a/rules/python.make b/rules/python.make
index 28a06449f..d9b9a0181 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -45,6 +45,9 @@ PYTHON_PATH := PATH=$(CROSS_PATH)
PYTHON_ENV := \
$(CROSS_ENV) \
PYTHON_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) \
+ ac_sys_system=Linux \
+ ac_sys_release=2 \
+ MACHDEP=linux2 \
ac_cv_have_chflags=no \
ac_cv_have_lchflags=no \
ac_cv_py_format_size_t=yes \