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

[Peter Pearse]

Fix PIC problem by using the correct config files during installation.
Note that multiarch paths are used and this results in the omission of the following extensions:-
   dbm
   _sqlite3
   _bsddb.

[Steve Langasek (vorlon)]

Still trying to wrap my brain around what this fPIC change in debian/rules is supposed to do, given that this should already be the upstream default. In my tests, setting -fPIC doesn't appear to have any effect, these extensions fail to be built /either way/. I see this in the build log no matter which way I slice it:

Failed to find the necessary bits to build these modules:
_bsddb _sqlite3 bsddb185
dbm dl gdbm
imageop sunaudiodev zlib
To find the necessary bits, look in setup.py in detect_modules() for the module's name.

And those modules seem to mostly fail to build anyway due to problems finding headers. I guess I'm missing something here?

review: Needs Information

[Peter Pearse (peter-pearse)]

No need to set -fPIC now that the make install gets the correct config files.
It was needed when the static python binary was being built & installed using the dynamic libpython

The following part of the patch ensures the static python is built with the static library or vice versa,

622 ifeq ($(with_interp),static)
623 - $(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr
624 + ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
625 + @echo "Build python should use the new pyconfig.h"
626 + cp $(buildd_static)/pyconfig.h $(buildd_cross)/pyconfig.h
627 + cp $(buildd_static)/Makefile $(buildd_cross)/Makefile
628 + endif
629 + $(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr $(CROSS)
630 else
631 - $(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr
632 + ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
633 + @echo "Build python should use the new pyconfig.h"
634 + cp $(buildd_shared)/pyconfig.h $(buildd_cross)/pyconfig.h
635 + cp $(buildd_shared)/Makefile $(buildd_cross)/Makefile
636 + endif
637 + $(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr $(CROSS)
638 endif

Unmerged revisions

68. By Peter Pearse on 2011-03-30

  * 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.
  * Use multiarch paths where applicable.
  * debian/rules - Build a build host python for use during a crossbuild.
  * Adjust the configuration files & make environment
                   accordingly.
  * Modules/Setup.dist - Drop system paths for zlib.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-25 17:45:24 +0000
+++ debian/changelog	2011-03-30 10:21:06 +0000
@@ -1,3 +1,18 @@
+python2.6 (2.6.6-6ubuntu8) natty; 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.
+  *            Use multiarch paths where applicable.
+  * debian/rules - Build a build host python for use during a crossbuild.
+  *                Adjust the configuration files & make environment 
+                   accordingly.
+  * Modules/Setup.dist - Drop system paths for zlib.
+
+ -- Peter Pearse <[e-mail]>  Wed, 30 Mar 2011 10:12:04 +0000
+
 python2.6 (2.6.6-6ubuntu7) natty; urgency=low
 
   * Search libraries in multiarch directories too. LP: #738213.

=== added file 'debian/patches/cross.diff'
--- debian/patches/cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cross.diff	2011-03-30 10:21:06 +0000
@@ -0,0 +1,299 @@
+Index: python2.6/configure.in
+===================================================================
+--- python2.6.orig/configure.in	2011-03-30 10:01:20.000000000 +0000
++++ python2.6/configure.in	2011-03-30 10:01:20.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,
+Index: python2.6/Makefile.pre.in
+===================================================================
+--- python2.6.orig/Makefile.pre.in	2011-03-30 10:01:20.000000000 +0000
++++ python2.6/Makefile.pre.in	2011-03-30 10:01:20.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:	$(BUILDPYTHON) $(PYTHON) oldsharedmods sharedmods gdbhooks
+ 
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -371,7 +373,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:
+@@ -386,17 +388,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)
++			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-platform: $(BUILDPYTHON)
++platform: $(BUILDPYTHON) $(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: $(BUILDPYTHON) $(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;; \
+@@ -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
+@@ -528,10 +530,9 @@
+ Modules/python.o: $(srcdir)/Modules/python.c
+ 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+ 
+-
+-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+-		-@$(INSTALL) -d Include
+-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++$(GRAMMAR_H) $(GRAMMAR_C): $(BUILDPGEN) $(PGEN) $(GRAMMAR_INPUT)
++	-@$(INSTALL) -d Include
++	-$(BUILDPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -780,7 +781,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 \
+@@ -789,7 +790,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); \
+@@ -1014,7 +1015,7 @@
+ 
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+-sharedinstall:
++sharedinstall: $(BUILDPYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+@@ -1039,7 +1040,7 @@
+ 
+ frameworkinstallframework: frameworkinstallstructure install frameworkinstallmaclib
+ 
+-frameworkinstallstructure:	$(LDLIBRARY)
++frameworkinstallstructure: $(BUILDPYTHON) $(LDLIBRARY)
+ 	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+ 		echo Not configured with --enable-framework; \
+ 		exit 1; \
+@@ -1094,7 +1095,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) \
+@@ -1110,14 +1111,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,
+@@ -1162,7 +1163,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
+@@ -1215,7 +1216,7 @@
+ 		-o -print
+ 
+ # Perform some verification checks on any modified files.
+-patchcheck:
++patchcheck: $(BUILDPYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+ 
+ # Dependencies
+Index: python2.6/Modules/Setup.dist
+===================================================================
+--- python2.6.orig/Modules/Setup.dist	2011-03-30 10:01:20.000000000 +0000
++++ python2.6/Modules/Setup.dist	2011-03-30 10:01:20.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.6/setup.py
+===================================================================
+--- python2.6.orig/setup.py	2011-03-30 10:01:20.000000000 +0000
++++ python2.6/setup.py	2011-03-30 10:05:34.000000000 +0000
+@@ -235,6 +235,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/lib/' + host_gnu_type
++            os.environ["CFLAGS"]   = '-I/usr/include/' + host_gnu_type
++            # 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++
+@@ -313,6 +330,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)))
+@@ -394,11 +418,13 @@
+                     for directory in reversed(options.dirs):
+                         add_dir_to_list(dir_list, directory)
+ 
+-        if os.path.normpath(sys.prefix) != '/usr':
+-            add_dir_to_list(self.compiler.library_dirs,
+-                            sysconfig.get_config_var("LIBDIR"))
+-            add_dir_to_list(self.compiler.include_dirs,
+-                            sysconfig.get_config_var("INCLUDEDIR"))
++        # Don't add the system path for cross builds
++        if os.environ.get('CROSS_COMPILE') is None:
++            if os.path.normpath(sys.prefix) != '/usr':
++                add_dir_to_list(self.compiler.library_dirs,
++                             sysconfig.get_config_var("LIBDIR"))
++                add_dir_to_list(self.compiler.include_dirs,
++                             sysconfig.get_config_var("INCLUDEDIR"))
+ 
+         try:
+             have_unicode = unicode
+@@ -416,6 +442,7 @@
+             ]
+         inc_dirs = self.compiler.include_dirs + ['/usr/include']
+         inc_dirs.append(os.path.join('/usr/include', gnu_triplet))
++
+         exts = []
+         missing = []
+ 
+@@ -1841,6 +1868,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	2010-10-12 12:53:47 +0000
+++ debian/patches/series.in	2011-03-30 10:21:06 +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-30 10:21:06 +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)
@@ -102,8 +118,17 @@
 ifeq ($(DEB_HOST_ARCH),m68k)
     OPTSETTINGS = OPT="-fwrapv -g -O2 -Wall -Wstrict-prototypes"
 endif
+# For armel static objects which will be linked into shared modules
+# must be built as PIC
+# Note use of CONFIG_CFLAGS to allow CFLAGS entries to be defined elsewhere
+ifeq ($(DEB_HOST_ARCH),armel)
+#    CONFIG_EXTRAS_STATIC = CFLAGS="-fPIC $(CONFIG_CFLAGS)"
+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
@@ -167,30 +192,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 +231,53 @@
   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))
+
+# Build build host binary for use during the build
+# - various files will be accessed from the build-cross
+#   directory and must be copied in after variants are configured.
+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) $(CONFIG_EXTRAS_STATIC)
+	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 +296,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
@@ -237,7 +310,7 @@
 	cd $(buildd_static) && \
 	  CC="$(CC)" $(OPTSETTINGS) \
 	    ../configure \
-		$(common_configure_args)
+		$(common_configure_args) $(CONFIG_EXTRAS_STATIC)
 	egrep \
 	  "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \
 	  Modules/Setup.dist | sed 's/^#//' \
@@ -245,7 +318,6 @@
 	cd $(buildd_static) && \
 	  ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
 	    Modules/Setup.config Modules/Setup.local Modules/Setup
-
 	: # apply workaround for missing os.fsync
 	sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(buildd_static)/pyconfig.h \
 		> $(buildd_static)/pyconfig.h.new
@@ -253,6 +325,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 +356,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 +389,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 +412,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
@@ -412,6 +506,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 +521,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 +585,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 +616,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 +669,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_shared)/pyconfig.h $(buildd_cross)/pyconfig.h
+	cp $(buildd_shared)/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
@@ -806,8 +917,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 +939,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 \