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

[Peter Pearse]

SUPERSEDES https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.6/prop002
That branch has been left to preserve the review comments.

setup.py:
- Renamed the variable to indicate it's origin
- Set LDFLAGS & CFLAGS for cross builds empty, rather than setting "sysrooted" values
  Cross toolchain ASSUMED to cope with location the required headers & libraries

debian/rules
- Replaced the arm test as per review comment
- Added -fPIC for static armel builds. Otherwise the module builds fail with
  "relocation R_ARM_THM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC"

Makefile.pre.in
- dependencies adjusted as per review comments
- unnecessary, e.g. whitespace, changes removed.

[Steve Langasek (vorlon)]

+# 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

This is new - and rather surprising actually, as armel is not unique in having this requirement. Nor has python2.6 failed to build with the natty native toolchain. Please dig deeper to find out why this is failing.

review: Needs Fixing

[Steve Langasek (vorlon)]

@@ -200,17 +225,58 @@
                --enable-unicode=ucs4 \
                --with-system-expat

-ifeq ($(DEB_HOST_ARCH), avr32)
+ifeq ($(DEB_HOST_ARCH), arm avr32)
   common_configure_args += --without-ffi
 else
   common_configure_args += --with-system-ffi
 endif

@@ -342,7 +436,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))

looks like 'arm' got added back in the wrong section.

review: Needs Fixing

[Peter Pearse (peter-pearse)]

Yes arm was in the wrong place.

The PIC error arises because the packages, as patched, is trying to build the perl dynamic modules against the static library. Altho linking static code into dynamic objects is theoretically allowed, armel static libraries are not guaranteed to be PIC. In this case they aren't so the linking fails.
I need to stop the cross build trying to do this.......

[Peter Pearse (peter-pearse)]

PIC error - host build skips building the modules during the static build - they are seen as uptodate

[Peter Pearse (peter-pearse)]

Fix is to use the correct configuration files during installation...
See https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.6/prop004.

This branch left so comments can be accessed.

[lp:~peter-pearse/ubuntu/natty/python2.6/prop003]

68. By Peter Pearse on 2011-03-29

  * 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 crossbuild
                   Adjust the configuration files & make environment
                   accordingly
  * Modules/Setup.dist - Drop system paths for zlib.

[Steve Langasek (vorlon)]

On Tue, Mar 29, 2011 at 02:31:29PM -0000, Peter Pearse wrote:
> Fix is to use the correct configuration files during installation...
> See https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.6/prop004.

This branch is not available.

> This branch left so comments can be accessed.

You can also commit your further changes on top of the existing branch and
push to it, no need to create a separate branch and merge request each time;
that would probably be easier on your side, and it also makes it easier to
see the change history if it's viewable on a single branch.

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

[Peter Pearse (peter-pearse)]

There now

Pushed before I read your note re pushing on the same branch.

However my bzr knowledge wouldn't be good enough anyway - doko had

changed the lp:ubuntu/python2.6.....

Presumably I could have just merged his changes in, but it was easier to rebase

Peter

> -----Original Message-----
> From: <email address hidden> [mailto:<email address hidden>] On
> Behalf Of Steve Langasek
> Sent: 29 March 2011 19:49
> To: Peter Pearse
> Subject: Re: [Merge]
> lp:~peter-pearse/ubuntu/natty/python2.6/prop003 into
> lp:ubuntu/python2.6
>
> On Tue, Mar 29, 2011 at 02:31:29PM -0000, Peter Pearse wrote:
> > Fix is to use the correct configuration files during installation...
> > See
> https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.
> 6/prop004.
>
> This branch is not available.
>
> > This branch left so comments can be accessed.
>
> You can also commit your further changes on top of the
> existing branch and push to it, no need to create a separate
> branch and merge request each time; that would probably be
> easier on your side, and it also makes it easier to see the
> change history if it's viewable on a single branch.
>
> --
> Steve Langasek Give me a lever long enough
> and a Free OS
> Debian Developer to set it on, and I can
> move the world.
> Ubuntu Developer
> http://www.debian.org/
> <email address hidden>
> <email address hidden>
>
> https://code.launchpad.net/~peter-pearse/ubuntu/natty/python2.
> 6/prop003/+merge/53601
> You are the owner of lp:~peter-pearse/ubuntu/natty/python2.6/prop003.
>
>

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Unmerged revisions

68. By Peter Pearse on 2011-03-29

  * 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 crossbuild
                   Adjust the configuration files & make environment
                   accordingly
  * Modules/Setup.dist - Drop system paths for zlib.

67. By Peter Pearse on 2011-03-16

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 crossbuild.
             - Adjust the configuration files & make environment accordingly.
             - Compile static armel objects with -fPIC

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-25 17:45:24 +0000
+++ debian/changelog	2011-03-29 15:11:04 +0000
@@ -1,9 +1,27 @@
+<<<<<<< TREE
 python2.6 (2.6.6-6ubuntu7) natty; urgency=low
 
   * Search libraries in multiarch directories too. LP: #738213.
 
  -- Matthias Klose <doko@timbuktu>  Fri, 25 Mar 2011 17:45:24 +0100
 
+=======
+python2.6 (2.6.6-6ubuntu7) 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.
+  * debian/rules - Build a build host python for use during a crossbuild
+                   Adjust the configuration files & make environment
+                   accordingly
+  *              - Compile static armel objects with -fPIC.
+  * Modules/Setup.dist - Drop system paths for zlib.
+
+ -- Peter Pearse <[e-mail]>  Tue, 29 Mar 2011 15:03:05 +0000
+
+>>>>>>> MERGE-SOURCE
 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-29 15:11:04 +0000
@@ -0,0 +1,318 @@
+Index: python2.6/configure.in
+===================================================================
+--- python2.6.orig/configure.in	2011-03-29 14:45:33.000000000 +0000
++++ python2.6/configure.in	2011-03-29 14:45:33.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-29 14:45:33.000000000 +0000
++++ python2.6/Makefile.pre.in	2011-03-29 14:45:53.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
+@@ -529,9 +531,9 @@
+ 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+ 
+ 
+-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
++$(GRAMMAR_H) $(GRAMMAR_C): $(BUILDPGEN) $(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:	$(BUILDPYTHON) $(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); \
+@@ -1014,7 +1016,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 +1041,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 +1096,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 +1112,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 +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
+@@ -1215,7 +1217,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-29 14:45:33.000000000 +0000
++++ python2.6/Modules/Setup.dist	2011-03-29 14:45:33.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-29 14:45:33.000000000 +0000
++++ python2.6/setup.py	2011-03-29 14:45:33.000000000 +0000
+@@ -235,6 +235,32 @@
+         # 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'
++            # Ensure system directories not used
++            # - because python determines what packages are installed by
++            # searching it's include paths for their headers
++            # [ wrongly in my opinion
++            #   - should attempt to compile & link test programs
++            #     or ask pkgconfig ]
++            # we add in the current cross install locations here.
++            # Should multiarch implementation result in only one
++            # location for architecture independent headers this mechanism
++            # will need reconsideration.
++            os.environ["LDFLAGS"]  = '-L/usr/' + host_gnu_type + '/lib'
++            os.environ["CFLAGS"]   = '-I/usr/' + host_gnu_type + '/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 +339,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,12 +427,14 @@
+                     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,
++        # Don't add the system path for cross builds
++        # - ASSUME toolchain will search correct multiarch paths
++        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,
++                add_dir_to_list(self.compiler.include_dirs,
+                             sysconfig.get_config_var("INCLUDEDIR"))
+-
+         try:
+             have_unicode = unicode
+         except NameError:
+@@ -412,7 +447,18 @@
+             '/lib64', '/usr/lib64',
+             '/lib', '/usr/lib',
+             ]
+-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
++
++	inc_dirs = self.compiler.include_dirs
++        # Don't add the system path for cross builds
++        # - need "sysrooted paths" until location of headers
++        #   in multiarch clarified (and implemented)
++        if os.environ.get('CROSS_COMPILE') is None:
++             inc_dirs = inc_dirs + ['/usr/include']
++        else:
++             host_gnu_type = os.environ.get('CROSS_COMPILE')
++             inc_dirs = inc_dirs + ['/usr/' + host_gnu_type + '/include']
++             lib_dirs = inc_dirs + ['/usr/' + host_gnu_type + '/lib']
++
+         gnu_triplet = os.popen('dpkg-architecture -qDEB_HOST_GNU_TYPE').readline()[:-1]
+         inc_dirs.append(os.path.join('/usr/include', gnu_triplet))
+         exts = []
+@@ -1840,6 +1886,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-29 15:11:04 +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-29 15:11:04 +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
@@ -138,7 +163,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 +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 \