Merge lp:~jtaylor/ubuntu/precise/python-numpy/multiarch-fix-818867 into lp:ubuntu/precise/python-numpy

[Julian Taylor]

make numpy's distutils multiarch aware.
See bug 818867 and its duplicate.

the method is very ugly due to the lack of a proper way to get the triplet in python.
Ideally numpy's distutil should not need to know the paths at all and leave that to the compiler but that is a major change better left to upstream once multiarch has settled a bit.

one can test the patch with natty's python-enable package (oneiric's has been patched to work around the issue).
without numpy's patch you get this result:
ldd -r ./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so 2>&1 | grep -v Py
 linux-vdso.so.1 => (0x00007fff82a16000)
 libstdc++.so.6 => /usr/lib/x86_64-linux-gnu/libstdc++.so.6 (0x00007fb970780000)
 libgcc_s.so.1 => /lib/x86_64-linux-gnu/libgcc_s.so.1 (0x00007fb97056a000)
 libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007fb97034c000)
 libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007fb96ffad000)
 libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007fb96fd29000)
 /lib64/ld-linux-x86-64.so.2 (0x00007fb970cc7000)
undefined symbol: XCreateImage (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)
undefined symbol: XOpenDisplay (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)
undefined symbol: XCloseDisplay (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)
undefined symbol: XFreeGC (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)
undefined symbol: XCreateGC (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)
undefined symbol: XPutImage (./usr/lib/python2.7/dist-packages/enthought/kiva/agg/_plat_support.so)

with the patch it correcly links with X11

[Serge Hallyn (serge-hallyn)]

Thanks very much for taking the time to submit this fix.

The debdiff looks good. I've tested the fix, and it worked for me.

review: Approve

[Julian Taylor (jtaylor)]

we will want to have numpy -4 in precise due to the better dh_numpy
maybe want to mash this commit into a merge to save some uploads.

[Julian Taylor (jtaylor)]

I created a numpy 1.6 merge which includes this changeset:
https://code.launchpad.net/~jtaylor/ubuntu/precise/python-numpy/merge-1.6/+merge/92671

[Julian Taylor (jtaylor)]

the 1.6 branch was merged, which effectively has merged this one too

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-17 17:22:00 +0000
+++ debian/changelog	2011-12-30 19:46:25 +0000
@@ -1,3 +1,10 @@
+python-numpy (1:1.5.1-2ubuntu4) precise; urgency=low
+
+  * debian/patches/search-multiarch-paths.patch: (LP: #818867)
+    - add multiarch libdirs to numpy.distutils.system_info
+
+ -- Julian Taylor <[e-mail]>  Fri, 30 Dec 2011 20:18:49 +0100
+
 python-numpy (1:1.5.1-2ubuntu3) precise; urgency=low
 
   * Build using dh_python2

=== added file 'debian/patches/search-multiarch-paths.patch'
--- debian/patches/search-multiarch-paths.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/search-multiarch-paths.patch	2011-12-30 19:46:25 +0000
@@ -0,0 +1,21 @@
+Description: search multiarch paths for libraries
+ hack to get numpys distutils multiarch aware
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-numpy/+bug/818867
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640940
+Author: Julian Taylor <[e-mail]>
+
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -200,6 +200,12 @@
+                                      '/usr/lib'], platform_bits)
+     default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
+                                 '/usr/include']
++    import subprocess as sp
++    p = sp.Popen(["dpkg-architecture", "-qDEB_HOST_MULTIARCH"], stdout=sp.PIPE)
++    triplet = p.communicate()[0].strip()
++    if p.returncode == 0:
++        default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
++        default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
+ 
+ if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
+     default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-25 23:56:45 +0000
+++ debian/patches/series	2011-12-30 19:46:25 +0000
@@ -5,3 +5,4 @@
 10_use_local_python.org_object.inv_sphinx.diff
 20_disable-plot-extension.patch
 debian-changes-1:1.5.1-2ubuntu2
+search-multiarch-paths.patch