[Python-modules-commits] r21892 - in packages/numpy/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, May 23, 2012 @ 21:25:23
  Author: morph
Revision: 21892

* debian/patches/50_search-multiarch-paths.patch
  - re-introduce multi-arch paths detection, as a Debian-specific patch, until
    upstream will support a generic solution; Closes: #640940

Added:
  packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-05-23 20:02:32 UTC (rev 21891)
+++ packages/numpy/trunk/debian/changelog	2012-05-23 21:25:23 UTC (rev 21892)
@@ -1,8 +1,11 @@
 python-numpy (1:1.6.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/50_search-multiarch-paths.patch
+    - re-introduce multi-arch paths detection, as a Debian-specific patch, until
+      upstream will support a generic solution; Closes: #640940
 
- -- Sandro Tosi <morph at debian.org>  Sun, 20 May 2012 13:14:22 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 23 May 2012 22:35:39 +0200
 
 python-numpy (1:1.6.2~rc1-1) unstable; urgency=low
 

Added: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-05-23 21:25:23 UTC (rev 21892)
@@ -0,0 +1,28 @@
+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 <jtaylor at ubuntu.com>
+Forwarded: no (it's a Debian specific patch, for now)
+
+Index: python-numpy-1.6.2~rc1/numpy/distutils/system_info.py
+===================================================================
+--- python-numpy-1.6.2~rc1.orig/numpy/distutils/system_info.py	2012-05-04 21:51:57.000000000 +0200
++++ python-numpy-1.6.2~rc1/numpy/distutils/system_info.py	2012-05-23 22:32:01.192226184 +0200
+@@ -203,6 +203,16 @@
+                                      '/usr/lib'], platform_bits)
+     default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
+                                 '/usr/include']
++    try:
++       import subprocess as sp
++       p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE)
++       triplet = str(p.communicate()[0].decode().strip())
++       if p.returncode == 0:
++           default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
++           default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
++    except:
++       warnings.warn('failed to detect multiarch paths, please install gcc')
++
+     if os.path.exists('/usr/lib/X11'):
+         globbed_x11_dir = glob('/usr/lib/*/libX11.so')
+         if globbed_x11_dir:

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2012-05-23 20:02:32 UTC (rev 21891)
+++ packages/numpy/trunk/debian/patches/series	2012-05-23 21:25:23 UTC (rev 21892)
@@ -5,3 +5,4 @@
 10_use_local_python.org_object.inv_sphinx.diff
 20_sphinx_1.1.2.diff
 40_m68k_long_double_format.diff
+50_search-multiarch-paths.patch