Merge lp:~peter-pearse/ubuntu/natty/python2.6/prop002 into lp:ubuntu/natty/python2.6

[Peter Pearse]

Fixes most of the points raised in review of https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.6/prop001.

That has been left as a proposal in order to keep the review comments available but is

SUPERSEDED by this proposal,

[Steve Langasek (vorlon)]

Looks better. Still have a few comments; carrying over conversation from the previous merge request.

> b) /usr/$arch exec_prefix
> exec_prefix is DEB_HOST_GNU_TYPE Is that == $arch?
> These are the build host installation directories - "sysroot"
> where crossed packages are installed, so they are needed in the path.

I assumed from context that exec_prefix is $arch.

dpkg-cross installs all packages to /usr/$arch/lib, /usr/$arch/include.
multiarch packages will install to /usr/lib/$arch and /usr/include/$arch
(but you shouldn't need to add these paths anywhere because they're on the
system path). The only way to get a path of /usr/$arch/usr/lib or
/usr/$arch/usr/include, from a package, is by unpacking it directly to
/usr/$arch with 'dpkg -x'. That should never be needed; basically this is a
workaround for a bug in some other package not being crossable with
dpkg-cross, and I don't think we should merge those workarounds into the
package.

> c) I'm dropping the arm, not adding it. There are several other tests
> against DEB_HOST_ARCH for it.....

Yes - but it's a test for the architecture named 'arm', whereas all our
builds are for 'armel', which should never match here. Whatever this check
was needed for on the old OABI port, it probably still applies there and we
shouldn't change it.

New comments:

The one thing I notice with cross.patch is that all the make dependencies have been changed from $(BUILDPYTHON) to $(PYTHON). I probably didn't explain this very well in my previous message; I meant that in the general case, there should be a dependency on both of these targets, e.g.:

-build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
+build_all: $(BUILDPYTHON) $(PYTHON) oldsharedmods sharedmods gdbhooks

and

-platform: $(BUILDPYTHON)
+platform: $(BUILDPYTHON) $(PYTHON)

This ensures that both the host and build python interpreters are available before trying to call these rules, so that all of the dependencies of the $(PYTHON) target have also been built first in case they're referenced. In the native compilation case, $(BUILDPYTHON) $(PYTHON) is simply redundant, so not a problem.

I've also just spied this:

+$(PYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
                $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
                        Modules/python.o \
                        $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)

BLDLIBRARY is a variable referring to options for the build architecture, so we need to update this to $(LDLIBRARY) as well.

 # Build the shared modules
-sharedmods: $(BUILDPYTHON)
+sharedmods: $(PYTHON)
        @case $$MAKEFLAGS in \
- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E ...

review: Needs Fixing

Unmerged revisions

67. By Peter Pearse on 2011-03-08

Cross patch - see details in debian changelog

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-23 23:41:57 +0000
+++ debian/changelog	2011-03-08 13:49:05 +0000
@@ -1,3 +1,15 @@
+python2.6 (2.6.6-6ubuntu7) maverick; urgency=low
+
+  * configure.in - Set buggygetaddrinfo for cross builds
+  *              - Add py_cv_has_zd_printf for cross builds
+  * 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]>  Tue, 08 Mar 2011 13:31:46 +0000
+
 python2.6 (2.6.6-6ubuntu6) natty; urgency=low
 
   * Disable the profiled build on ppc64.
 
=== added file 'debian/patches/cross.diff'
--- debian/patches/cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cross.diff	2011-03-08 13:49:05 +0000
@@ -0,0 +1,222 @@
+diff -Nru p/configure.in p_p/configure.in
+--- p/configure.in	2011-03-07 11:51:09.000000000 +0000
++++ p_p/configure.in	2011-03-07 11:52:23.000000000 +0000
+@@ -3018,8 +3018,8 @@
+ buggygetaddrinfo=no,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+-AC_MSG_RESULT(buggy)
+-buggygetaddrinfo=yes)], [
++AC_MSG_RESULT(cross)
++buggygetaddrinfo=no)], [
+ AC_MSG_RESULT(no)
+ buggygetaddrinfo=yes
+ ])
+@@ -3873,7 +3873,7 @@
+   AC_MSG_RESULT(no)
+ fi
+ 
+-AC_MSG_CHECKING(for %zd printf() format support)
++AC_CACHE_CHECK([for %zd printf() format support], [py_cv_has_zd_printf], [dnl
+ AC_TRY_RUN([#include <stdio.h>
+ #include <stddef.h>
+ #include <string.h>
+@@ -3907,10 +3907,13 @@
+ 	return 1;
+ 
+     return 0;
+-}],
+-[AC_MSG_RESULT(yes)
+- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
+- AC_MSG_RESULT(no))
++}], [py_cv_has_zd_printf="yes"],
++    [py_cv_has_zd_printf="no"],
++    [py_cv_has_zd_printf="cross -- assuming yes"]
++)])
++if test "$py_cv_has_zd_printf" != "no" ; then
++  AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])
++fi
+ 
+ AC_CHECK_TYPE(socklen_t,,
+   AC_DEFINE(socklen_t,int,
+diff -Nru p/Makefile.pre.in p_p/Makefile.pre.in
+--- p/Makefile.pre.in	2011-03-07 11:51:08.000000000 +0000
++++ p_p/Makefile.pre.in	2011-03-08 13:10:29.000000000 +0000
+@@ -207,6 +207,8 @@
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
++# Allow override for cross build
++BUILDPGEN=	$(PGEN)
+ 
+ POBJS=		\
+ 		Parser/acceler.o \
+@@ -354,7 +356,7 @@
+ 
+ # Default target
+ all:		build_all
+-build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all:	$(PYTHON) oldsharedmods sharedmods gdbhooks
+ 
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -386,20 +388,20 @@
+ 
+ 
+ # 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: $(PYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ 
+ 
+ # Build the shared modules
+-sharedmods: $(BUILDPYTHON)
++sharedmods: $(PYTHON)
+ 	@case $$MAKEFLAGS in \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*)   $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
+ # Build static library
+@@ -423,7 +425,7 @@
+ 	fi
+ 
+ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+-	 $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++	$(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 		 
+ 
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
+@@ -434,10 +436,10 @@
+ #
+ # 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
+ 
+-$(BUILDPYTHON)-gdb.py: Tools/gdb/libpython.py
+-	$(INSTALL_SCRIPT) $< $(BUILDPYTHON)-gdb.py
++$(PYTHON)-gdb.py: Tools/gdb/libpython.py
++	$(INSTALL_SCRIPT) $< $(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
+@@ -531,7 +533,7 @@
+ 
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+ 		-@$(INSTALL) -d Include
+-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		-$(BUILDPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -780,7 +782,7 @@
+ 
+ # Install the interpreter with $(VERSION) affixed
+ # This goes into $(exec_prefix)
+-altbininstall:	$(BUILDPYTHON)
++altbininstall:	$(PYTHON)
+ 	@for i in $(BINDIR) $(LIBDIR); \
+ 	do \
+ 		if test ! -d $(DESTDIR)$$i; then \
+@@ -789,7 +791,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); \
+@@ -1110,7 +1112,7 @@
+ 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:
+@@ -1162,7 +1164,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 \
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+diff -Nru p/Modules/Setup.dist p_p/Modules/Setup.dist
+--- p/Modules/Setup.dist	2011-03-07 11:51:08.000000000 +0000
++++ p_p/Modules/Setup.dist	2011-03-07 11:52: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
++# - using it breaks cross builds
++#zlib zlibmodule.c -I$(prefix)/include -lz
+ 
+ # Interface to the Expat XML parser
+ #
+diff -Nru p/setup.py p_p/setup.py
+--- p/setup.py	2011-03-07 11:51:08.000000000 +0000
++++ p_p/setup.py	2011-03-08 10:50:19.000000000 +0000
+@@ -235,6 +235,22 @@
+         # 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'):
++            exec_prefix=os.environ.get('CROSS_COMPILE')
++            os.environ["CC"]		= exec_prefix + '-gcc'
++            os.environ["CXX"]		= exec_prefix + '-g++'
++            os.environ["LDSHARED"]	= exec_prefix + '-gcc -shared'
++            os.environ["CPP"]		= exec_prefix + '-cpp'
++            os.environ["LDFLAGS"]	= '-L /usr/' + exec_prefix + '/lib -L /usr/' + exec_prefix + '/usr/lib'
++            os.environ["CFLAGS"]	= '-I/usr/' + exec_prefix + '/include -I/usr/' + exec_prefix + '/usr/include'
++	    # Use -D markers to detect if/where used
++            os.environ["CPPFLAGS"]	= '-DCPPFLAGS'
++            os.environ["BASECFLAGS"]	= '-DBASECFLAGS'
++            os.environ["OPT"]		= '-DOPT'
++
+         compiler = os.environ.get('CC')
+         args = {}
+         # unfortunately, distutils doesn't let us provide separate C and C++
+@@ -313,6 +329,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)))
+@@ -1840,6 +1863,11 @@
+                 mkpath(ffi_builddir)
+                 config_args = []
+ 
++		if os.environ.get('CROSS_COMPILE'):
++                    exec_prefix = os.environ.get('CROSS_COMPILE')
++                    print "Configuring _ctypes module for cross building %s" % (exec_prefix)
++                    config_args = [ '--host ' + exec_prefix]
++
+                 # 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	2010-10-12 12:53:47 +0000
+++ debian/patches/series.in	2011-03-08 13:49:05 +0000
@@ -60,3 +60,4 @@
 link-system-expat.diff
 plat-gnukfreebsd.diff
 issue7356.diff
+cross.diff
 
=== modified file 'debian/rules'
--- debian/rules	2011-02-23 23:41:57 +0000
+++ debian/rules	2011-03-08 13:49:05 +0000
@@ -10,6 +10,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}')
@@ -25,6 +27,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
@@ -138,7 +157,7 @@
 d_dbg	:= debian/$(p_dbg)
 
 # profiled build fails on amd64, lpia, sparc
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel hppa i386 ia64 lpia mips mipsel powerpc ppc64 s390 sparc64 hurd-i386 kfreebsd-i386 kfreebsd-amd64))
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel hppa i386 ia64 lpia mips mipsel powerpc s390 sparc64 hurd-i386 kfreebsd-i386 kfreebsd-amd64))
   make_build_target =
 else
   make_build_target = profile-opt
@@ -167,30 +186,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
 
@@ -206,11 +225,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)
@@ -229,6 +289,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
@@ -253,6 +319,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
@@ -278,6 +350,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
@@ -305,9 +383,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
@@ -321,6 +406,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
@@ -342,7 +430,7 @@
 ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
   TEST_EXCLUDES += test_fork1 test_multiprocessing test_socketserver test_wait3 test_wait4 test_gdb
 endif
-ifneq (,$(filter $(DEB_HOST_ARCH), arm avr32))
+ifneq (,$(filter $(DEB_HOST_ARCH), avr32))
   TEST_EXCLUDES += test_ctypes
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH), m68k avr32))
@@ -412,6 +500,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
@@ -426,6 +515,9 @@
 	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))
@@ -487,7 +579,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
@@ -518,14 +610,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
@@ -568,9 +663,9 @@
 	: # their packages' directories.
 	install -d $(d)/usr
 ifeq ($(with_interp),static)
-	$(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr
+	$(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr $(CROSS)
 else
-	$(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr
+	$(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
@@ -806,8 +901,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)
+else
+	$(buildd_cross)/python debian/mkbinfmt.py $(PVER) \
+		> $(d_min)/usr/share/binfmts/$(PVER)
+endif
 
 	: # desktop entry
 	mkdir -p $(d_base)/usr/share/applications
@@ -823,7 +923,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 \