Merge lp:~peter-pearse/ubuntu/natty/python2.7/prop003 into lp:ubuntu/natty/python2.7

[Peter Pearse]

Changed to resemble python2.6 prop004

Unmerged revisions

29. By Peter Pearse on 2011-04-07

  * Modules/Setup.dist - drop system paths for zlib.
  * Makefile.pre.in - Use BUILDPYTHON where applicable for cross builds.
  * setup.py - For cross builds, pass cross toolchain info in python
    environment.
  * debian/rules - Build a build host python for use during a cross
    build. Adjust the configuration files & make environment
    accordingly.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-23 15:02:47 +0000
+++ debian/changelog	2011-04-07 14:02:15 +0000
@@ -1,3 +1,15 @@
+python2.7 (2.7.1-5ubuntu2) natty; urgency=low
+
+  * Modules/Setup.dist - drop system paths for zlib.
+  * Makefile.pre.in - Use BUILDPYTHON where applicable for cross builds.
+  * setup.py - For cross builds, pass cross toolchain info in python
+    environment.
+  * debian/rules - Build a build host python for use during a cross
+    build. Adjust the configuration files & make environment
+    accordingly.
+
+ -- Peter Pearse <[e-mail]>  Thu, 07 Apr 2011 12:59:39 +0000
+
 python2.7 (2.7.1-5ubuntu1) natty; urgency=low
 
   * debian/patches/deb-setup.diff: DEB_GNU_TYPE was never being set, so
 
=== added file 'debian/patches/cross.diff'
--- debian/patches/cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cross.diff	2011-04-07 14:02:15 +0000
@@ -0,0 +1,252 @@
+Index: python2.7/Makefile.pre.in
+===================================================================
+--- python2.7.orig/Makefile.pre.in	2011-04-07 10:41:23.000000000 +0000
++++ python2.7/Makefile.pre.in	2011-04-07 10:41:23.000000000 +0000
+@@ -213,6 +213,9 @@
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
++# Allow override for cross build
++BUILDPGEN=	$(PGEN)
++
+ 
+ POBJS=		\
+ 		Parser/acceler.o \
+@@ -364,7 +367,7 @@
+ 
+ # Default target
+ all:		build_all
+-build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all:	$(BUILDPYTHON) $(PYTHON) oldsharedmods sharedmods gdbhooks
+ 
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -381,7 +384,7 @@
+ build_all_generate_profile:
+ 	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
+ 
+-run_profile_task:
++run_profile_task: $(BUILDPYTHON) $(PYTHON)
+ 	-./$(BUILDPYTHON) $(PROFILE_TASK)
+ 
+ build_all_use_profile:
+@@ -394,17 +397,17 @@
+ 
+ 
+ # Build the interpreter
+-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
++$(PYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+ 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-platform: $(BUILDPYTHON)
++platform: $(BUILDPYTHON) $(PYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ 
+ 
+ # Build the shared modules
+-sharedmods: $(BUILDPYTHON)
++sharedmods: $(BUILDPYTHON) $(PYTHON)
+ 	@case $$MAKEFLAGS in \
+ 	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+ 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+@@ -424,10 +427,10 @@
+ 
+ libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+-		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 		$(LN) -f $(INSTSONAME) $@; \
+ 	else \
+-		$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 	fi
+ 
+ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+@@ -442,11 +445,11 @@
+ #
+ # Distributors are likely to want to install this somewhere else e.g. relative
+ # to the stripped DWARF data for the shared library.
+-gdbhooks: $(BUILDPYTHON)-gdb.py
++gdbhooks: $(PYTHON)-gdb.py
+ 
+ SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
+-$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
+-	$(INSTALL_DATA) $(SRC_GDB_HOOKS) $(BUILDPYTHON)-gdb.py
++$(PYTHON)-gdb.py: $(SRC_GDB_HOOKS)
++	$(INSTALL_DATA) $(SRC_GDB_HOOKS) $(PYTHON)-gdb.py
+ 
+ # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
+ # minimal framework (not including the Lib directory and such) in the current
+@@ -540,9 +543,9 @@
+ 
+ # Use a stamp file to prevent make -j invoking pgen twice
+ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+-Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
++Parser/pgen.stamp: $(BUILDPGEN) $(GRAMMAR_INPUT)
+ 		-@$(INSTALL) -d Include
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		$(BUILDPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 		-touch Parser/pgen.stamp
+ 
+ $(PGEN):	$(PGENOBJS)
+@@ -801,7 +804,7 @@
+ 
+ # Install the interpreter with $(VERSION) affixed
+ # This goes into $(exec_prefix)
+-altbininstall:	$(BUILDPYTHON)
++altbininstall:	$(BUILDPYTHON) $(PYTHON)
+ 	@for i in $(BINDIR) $(LIBDIR); \
+ 	do \
+ 		if test ! -d $(DESTDIR)$$i; then \
+@@ -810,7 +813,7 @@
+ 		else	true; \
+ 		fi; \
+ 	done
+-	$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
++	$(INSTALL_PROGRAM) $(PYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
+ 	if test -f $(LDLIBRARY); then \
+ 		if test -n "$(DLLLIBRARY)" ; then \
+ 			$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
+@@ -1048,7 +1051,7 @@
+ 
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+-sharedinstall: sharedmods
++sharedinstall: $(BUILDPYTHON) sharedmods
+ 	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+@@ -1073,7 +1076,7 @@
+ 
+ frameworkinstallframework: frameworkinstallstructure install frameworkinstallmaclib
+ 
+-frameworkinstallstructure:	$(LDLIBRARY)
++frameworkinstallstructure:	$(BUILDPYTHON) $(LDLIBRARY)
+ 	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+ 		echo Not configured with --enable-framework; \
+ 		exit 1; \
+@@ -1120,7 +1123,7 @@
+ 	cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"
+ 
+ # This installs a few of the useful scripts in Tools/scripts
+-scriptsinstall:
++scriptsinstall: $(BUILDPYTHON)
+ 	SRCDIR=$(srcdir) $(RUNSHARED) \
+ 	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
+ 	--prefix=$(prefix) \
+@@ -1136,14 +1139,14 @@
+ config.status:	$(srcdir)/configure
+ 	$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
+ 
+-.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
++.PRECIOUS: config.status $(PYTHON) Makefile Makefile.pre
+ 
+ # Some make's put the object file in the current directory
+ .c.o:
+ 	$(CC) -c $(PY_CFLAGS) -o $@ $<
+ 
+ # Run reindent on the library
+-reindent:
++reindent: $(BUILDPYTHON)
+ 	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
+ 
+ # Rerun configure with the same options as it was run last time,
+@@ -1188,7 +1191,7 @@
+ 	find . -name '*.gc??' -exec rm -f {} ';'
+ 
+ clobber: clean profile-removal
+-	-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
++	-rm -f $(PYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
+ 		tags TAGS Parser/pgen.stamp \
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+@@ -1246,7 +1249,7 @@
+ 		-o -print
+ 
+ # Perform some verification checks on any modified files.
+-patchcheck:
++patchcheck: $(BUILDPYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+ 
+ # Dependencies
+Index: python2.7/Modules/Setup.dist
+===================================================================
+--- python2.7.orig/Modules/Setup.dist	2011-04-07 10:41:23.000000000 +0000
++++ python2.7/Modules/Setup.dist	2011-04-07 10:41:23.000000000 +0000
+@@ -458,7 +458,9 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++# Well behaved toolchains should not require -L$(exec_prefix)/lib or -I$(prefix)/include
++# - using them breaks cross builds
++#zlib zlibmodule.c -lz
+ 
+ # Interface to the Expat XML parser
+ #
+Index: python2.7/setup.py
+===================================================================
+--- python2.7.orig/setup.py	2011-04-07 10:41:23.000000000 +0000
++++ python2.7/setup.py	2011-04-07 10:46:20.000000000 +0000
+@@ -225,6 +225,23 @@
+         # When you run "make CC=altcc" or something similar, you really want
+         # those environment variables passed into the setup.py phase.  Here's
+         # a small set of useful ones.
++
++        # Change the environment for cross compiling
++        # - may want to use environment variables for settings?
++        if os.environ.get('CROSS_COMPILE'):
++            host_gnu_type=os.environ.get('CROSS_COMPILE')
++            os.environ["CC"]           = host_gnu_type + '-gcc'
++            os.environ["CXX"]          = host_gnu_type + '-g++'
++            os.environ["LDSHARED"]     = host_gnu_type + '-gcc -shared'
++            os.environ["CPP"]          = host_gnu_type + '-cpp'
++            # Add in the multiarch locations here.
++            os.environ["LDFLAGS"]      = '-L /usr/' + host_gnu_type + '/lib -L /usr/' + host_gnu_type + '/usr/lib'
++            os.environ["CFLAGS"]       = '-I/usr/' + host_gnu_type + '/include -I/usr/' + host_gnu_type + '/usr/include'
++            # Use -D markers to detect if/where used
++            os.environ["CPPFLAGS"]     = '-DCROSSCPPFLAGS'
++            os.environ["BASECFLAGS"]   = '-DCROSSBASECFLAGS'
++            os.environ["OPT"]          = '-DCROSSOPT'
++
+         compiler = os.environ.get('CC')
+         args = {}
+         # unfortunately, distutils doesn't let us provide separate C and C++
+@@ -304,6 +321,13 @@
+             self.announce('WARNING: skipping import check for Cygwin-based "%s"'
+                 % ext.name)
+             return
++
++        # Cant import cross built modules
++        if os.environ.get('CROSS_COMPILE'):
++            self.announce('WARNING: skipping import check for %s, cross built for %s'
++                 % (ext.name, os.environ.get('CROSS_COMPILE')))
++            return
++
+         ext_filename = os.path.join(
+             self.build_lib,
+             self.get_ext_filename(self.get_ext_fullname(ext.name)))
+@@ -389,7 +413,8 @@
+                         add_dir_to_list(dir_list, directory)
+ 
+         if os.path.normpath(sys.prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
++                and not sysconfig.get_config_var('PYTHONFRAMEWORK')	\
++                       and not os.environ.get('CROSS_COMPILE'):
+             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+             # building a framework with different architectures than
+@@ -1846,6 +1871,11 @@
+                 mkpath(ffi_builddir)
+                 config_args = []
+ 
++                if os.environ.get('CROSS_COMPILE'):
++                    host_gnu_type = os.environ.get('CROSS_COMPILE')
++                    print "Configuring _ctypes module for cross building %s" % (host_gnu_type)
++                    config_args = [ '--host ' + host_gnu_type]
++
+                 # Pass empty CFLAGS because we'll just append the resulting
+                 # CFLAGS to Python's; -g or -O2 is to be avoided.
+                 cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
 
=== modified file 'debian/patches/series.in'
--- debian/patches/series.in	2011-02-24 06:01:42 +0000
+++ debian/patches/series.in	2011-04-07 14:02:15 +0000
@@ -50,3 +50,4 @@
 issue9054.diff
 link-system-expat.diff
 plat-gnukfreebsd.diff
+cross.diff
 
=== modified file 'debian/rules'
--- debian/rules	2011-02-24 06:01:42 +0000
+++ debian/rules	2011-04-07 14:02:15 +0000
@@ -11,6 +11,8 @@
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 changelog_values := $(shell dpkg-parsechangelog \
 			| awk '/^(Version|Source):/ {print $$2}')
@@ -26,6 +28,10 @@
 ifneq (,$(findstring nobench, $(DEB_BUILD_OPTIONS)))
   WITHOUT_BENCH := yes
 endif
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+  WITHOUT_BENCH := yes
+  WITHOUT_CHECK := yes
+endif
 ifeq ($(on_buildd),yes)
   ifneq (,$(findstring $(DEB_HOST_ARCH), hppa mips mipsel s390))
     WITHOUT_CHECK := yes
@@ -92,7 +98,17 @@
 endif
 with_fpectl = yes
 
-CC = gcc
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ CC = gcc
+ CROSS =
+else
+ CC = $(DEB_HOST_GNU_TYPE)-gcc
+ # Note that make runs the binaries as ./$(app), 
+ # - so they must not be absolutely pathed
+ CROSS = BUILDPYTHON=../build-cross/python      \
+         BUILDPGEN=../build-cross/Parser/pgen   \
+         CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)
+endif
 
 # on alpha, use -O2 only, use -mieee
 ifeq ($(DEB_HOST_ARCH),alpha)
@@ -104,6 +120,9 @@
 endif
 
 PWD		:= $(shell pwd)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ buildd_cross   := $(CURDIR)/build-cross
+endif
 buildd_static	:= $(CURDIR)/build-static
 buildd_shared	:= $(CURDIR)/build-shared
 buildd_debug	:= $(CURDIR)/build-debug
@@ -143,7 +162,9 @@
 else
   make_build_target = profile-opt
 endif
-make_build_target = profile-opt
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+  make_build_target = profile-opt
+endif
 
 build: $(build_target)
 build-all: stamps/stamp-build
@@ -168,30 +189,30 @@
 
 stamps/stamp-build-static: stamps/stamp-configure-static
 	dh_testdir
-	$(MAKE) $(NJOBS) -C $(buildd_static) \
+	$(MAKE) $(NJOBS) -C $(buildd_static) $(CROSS) \
 		PROFILE_TASK='$(PROFILE_TASK)' $(make_build_target)
 	touch stamps/stamp-build-static
 
 stamps/stamp-build-shared: stamps/stamp-configure-shared
 	dh_testdir
-	$(MAKE) $(NJOBS) -C $(buildd_shared)
+	$(MAKE) $(NJOBS) -C $(buildd_shared) $(CROSS)
 #	: # build the shared library
-#	$(MAKE) $(NJOBS) -C $(buildd_shared) \
+#	$(MAKE) $(NJOBS) -C $(buildd_shared)  $(CROSS) \
 #		libpython$(VER).so
 	: # build a static library with PIC objects
-	$(MAKE) $(NJOBS) -C $(buildd_shared) \
+	$(MAKE) $(NJOBS) -C $(buildd_shared)  $(CROSS) \
 		LIBRARY=libpython$(VER)-pic.a libpython$(VER)-pic.a
 	touch stamps/stamp-build-shared
 
 stamps/stamp-build-debug: stamps/stamp-configure-debug
 	dh_testdir
-	$(MAKE) $(NJOBS) -C $(buildd_debug)
+	$(MAKE) $(NJOBS) -C $(buildd_debug) $(CROSS)
 	touch stamps/stamp-build-debug
 
 stamps/stamp-build-shared-debug: stamps/stamp-configure-shared-debug
 	dh_testdir
 	: # build the shared debug library
-	$(MAKE) $(NJOBS) -C $(buildd_shdebug) \
+	$(MAKE) $(NJOBS) -C $(buildd_shdebug)  $(CROSS) \
 		libpython$(VER)_d.so
 	touch stamps/stamp-build-shared-debug
 
@@ -208,11 +229,52 @@
   common_configure_args += --with-system-ffi
 endif
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+  common_configure_args += \
+                --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+endif
+
 ifeq ($(with_fpectl),yes)
   common_configure_args += \
 		--with-fpectl
 endif
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+
+stamps/stamp-configure-cross: stamps/stamp-patch
+	rm -rf $(buildd_cross)
+	mkdir -p $(buildd_cross)
+	cd $(buildd_cross) && \
+          CC=gcc CONFIG_SITE= $(OPTSETTINGS) \
+            ../configure --build $(DEB_BUILD_GNU_TYPE)
+	egrep \
+          "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \
+            Modules/Setup.dist \
+          | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \
+            >> $(buildd_cross)/Modules/Setup.local
+	cd $(buildd_cross) && \
+          ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
+            Modules/Setup.config Modules/Setup.local Modules/Setup
+	mv $(buildd_cross)/config.c $(buildd_cross)/Modules/
+
+	@echo "Each build should use it's own pyconfig.h & Makefile variables"
+	cp $(buildd_cross)/pyconfig.h $(buildd_cross)/pyconfig.h.cross
+	cp $(buildd_cross)/Makefile $(buildd_cross)/Makefile.cross
+
+	touch stamps/stamp-configure-cross
+
+stamps/stamp-build-cross: stamps/stamp-configure-cross
+	dh_testdir
+	$(MAKE) $(NJOBS) -C $(buildd_cross) python Parser/pgen
+	touch stamps/stamp-build-cross
+
+stamps/stamp-configure-shared: stamps/stamp-build-cross
+stamps/stamp-configure-static: stamps/stamp-build-cross
+stamps/stamp-configure-debug: stamps/stamp-build-cross
+stamps/stamp-configure-shared-debug: stamps/stamp-build-cross
+
+endif
+
 stamps/stamp-configure-shared: stamps/stamp-patch
 	rm -rf $(buildd_shared)
 	mkdir -p $(buildd_shared)
@@ -231,6 +293,12 @@
 	    Modules/Setup.config Modules/Setup.local Modules/Setup
 	mv $(buildd_shared)/config.c $(buildd_shared)/Modules/
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h & Makefile "
+	cp $(buildd_shared)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_shared)/Makefile $(buildd_cross)/Makefile
+endif
+
 	touch stamps/stamp-configure-shared
 
 stamps/stamp-configure-static: stamps/stamp-patch
@@ -255,6 +323,12 @@
 	mv -f $(buildd_static)/pyconfig.h.new $(buildd_static)/pyconfig.h
 	mv $(buildd_static)/config.c $(buildd_static)/Modules/
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h"
+	cp $(buildd_static)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_static)/Makefile $(buildd_cross)/Makefile
+endif
+
 	touch stamps/stamp-configure-static
 
 stamps/stamp-configure-debug: stamps/stamp-patch
@@ -280,6 +354,12 @@
 	touch -r $(buildd_debug)/pyconfig.h $(buildd_debug)/pyconfig.h.new
 	mv -f $(buildd_debug)/pyconfig.h.new $(buildd_debug)/pyconfig.h
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h"
+	cp $(buildd_debug)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_debug)/Makefile $(buildd_cross)/Makefile
+endif
+
 	touch stamps/stamp-configure-debug
 
 stamps/stamp-configure-shared-debug: stamps/stamp-patch
@@ -307,9 +387,16 @@
 	touch -r $(buildd_shdebug)/pyconfig.h $(buildd_shdebug)/pyconfig.h.new
 	mv -f $(buildd_shdebug)/pyconfig.h.new $(buildd_shdebug)/pyconfig.h
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h"
+	cp $(buildd_shdebug)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_shdebug)/Makefile $(buildd_cross)/Makefile
+endif
+
 	touch stamps/stamp-configure-shared-debug
 
 stamps/stamp-mincheck: stamps/stamp-build-static debian/PVER-minimal.README.Debian.in
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	for m in $(MIN_MODS) $(MIN_PACKAGES) $(MIN_EXTS) $(MIN_BUILTINS); do \
 	  echo "import $$m"; \
 	done > $(buildd_static)/minmods.py
@@ -323,6 +410,9 @@
 	else true; fi
 	cd $(buildd_static) && ./python ../debian/mincheck.py \
 		minmods.py mindeps.txt
+else
+	@echo "No mincheck for cross build"
+endif
 	touch stamps/stamp-mincheck
 
 TEST_RESOURCES = all
@@ -419,6 +509,7 @@
 	touch stamps/stamp-check
 
 stamps/stamp-pystone:
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	@echo "BEGIN pystone static"
 	cd $(buildd_static) && ./python ../Lib/test/pystone.py
 	cd $(buildd_static) && ./python ../Lib/test/pystone.py
@@ -433,6 +524,10 @@
 	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
 	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
 	@echo "END pystone debug"
+else
+	@echo "No pystone for cross build"
+endif
+
 	touch stamps/stamp-pystone
 
 #ifeq (,$(filter $(DEB_HOST_ARCH), arm armel avr32 hppa mips mipsel m68k))
@@ -494,7 +589,7 @@
 
 stamps/stamp-doc-html:
 	dh_testdir
-	$(MAKE) -C Doc html
+	$(MAKE) -C Doc html $(CROSS)
 	touch stamps/stamp-doc-html
 
 build-doc: stamps/stamp-patch stamps/stamp-build-doc
@@ -525,14 +620,17 @@
 clean: control-file
 	dh_testdir
 	dh_testroot
-	$(MAKE) -f debian/rules unpatch
+	$(MAKE) -f debian/rules unpatch $(CROSS)
 	rm -rf stamps .pc
 	rm -f debian/test_results
 
-	$(MAKE) -C Doc clean
-	sed 's/^@/#/' Makefile.pre.in | $(MAKE) -f - srcdir=. distclean
+	$(MAKE) -C Doc clean $(CROSS)
+	sed 's/^@/#/' Makefile.pre.in | $(MAKE) -f - srcdir=. distclean $(CROSS)
 	rm -rf Lib/test/db_home
 	rm -rf $(buildd_static) $(buildd_shared) $(buildd_debug) $(buildd_shdebug)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	rm -rf $(buildd_cross)
+endif
 	find -name '*.py[co]' | xargs -r rm -f
 	rm -f Lib/lib2to3/*.pickle
 	rm -rf locales
@@ -575,9 +673,19 @@
 	: # their packages' directories.
 	install -d $(d)/usr
 ifeq ($(with_interp),static)
-	$(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr
+  ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h"
+	cp $(buildd_static)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_static)/Makefile $(buildd_cross)/Makefile
+  endif
+	$(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr $(CROSS)
 else
-	$(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr
+  ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	@echo "Build python should use the new pyconfig.h"
+	cp $(buildd_static)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_static)/Makefile $(buildd_cross)/Makefile
+  endif
+	$(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr $(CROSS)
 endif
 	-find $(d)/usr/lib/python$(VER) -name '*_failed*.so'
 	find $(d)/usr/lib/python$(VER) -name '*_failed*.so' | xargs -r rm -f
@@ -815,8 +923,13 @@
 
 	: # generate binfmt file
 	mkdir -p $(d_min)/usr/share/binfmts
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	$(buildd_static)/python debian/mkbinfmt.py $(PVER) \
-		> $(d_min)/usr/share/binfmts/$(PVER)
+                > $(d_min)/usr/share/binfmts/$(PVER)
+else
+	$(buildd_cross)/python debian/mkbinfmt.py $(PVER) \
+                > $(d_min)/usr/share/binfmts/$(PVER)
+endif
 
 	: # desktop entry
 	mkdir -p $(d_base)/usr/share/applications
@@ -832,7 +945,7 @@
 
 	: # install debug package
 	rm -rf $(d)-dbg
-	$(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg
+	$(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg $(CROSS)
 	dh_installdirs -p$(p_dbg) \
 		usr/bin \
 		usr/share/man/man1 \