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

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

@@ -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.

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.......

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

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.

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>

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.