Merge lp:~jtaylor/ubuntu/precise/python-numpy/lp956901 into lp:ubuntu/precise/python-numpy

[Julian Taylor]

use gcc -print-multiarch instead of dpkg-architecture and recommend it, also wrap it into a try except and add a error message if gcc is missing

[lp:~jtaylor/ubuntu/precise/python-numpy/lp956901]

24. By Julian Taylor on 2012-03-18

use decode to make the patch compatible with python3

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-03-18 21:26:18 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-03-18 21:26:18 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/search-multiarch-paths.patch/.timestamp'
=== modified file 'debian/changelog'
--- debian/changelog	2012-02-11 12:55:21 +0000
+++ debian/changelog	2012-03-18 21:26:18 +0000
@@ -1,3 +1,10 @@
+python-numpy (1:1.6.1-5ubuntu2) precise; urgency=low
+
+  * update search-multiarch-paths.patch (LP: #956901)
+    use gcc -print-multiarch to detect the path and recommend gcc
+
+ -- Julian Taylor <[e-mail]>  Fri, 16 Mar 2012 20:25:31 +0100
+
 python-numpy (1:1.6.1-5ubuntu1) precise; urgency=low
 
   * debian/patches/search-multiarch-paths.patch: (LP: #818867)

=== modified file 'debian/control'
--- debian/control	2012-02-11 12:55:21 +0000
+++ debian/control	2012-03-18 21:26:18 +0000
@@ -14,6 +14,7 @@
 Package: python-numpy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: gcc
 Suggests: python-numpy-doc, python-numpy-dbg, python-nose (>= 0.10.1), python-dev, gfortran
 Provides: ${python:Provides}, ${numpy:Provides}, python-numpy-dev, python-f2py
 Description: Numerical Python adds a fast array facility to the Python language

=== modified file 'debian/patches/search-multiarch-paths.patch'
--- debian/patches/search-multiarch-paths.patch	2012-02-11 12:55:21 +0000
+++ debian/patches/search-multiarch-paths.patch	2012-03-18 21:26:18 +0000
@@ -6,16 +6,19 @@
 
 --- a/numpy/distutils/system_info.py
 +++ b/numpy/distutils/system_info.py
-@@ -201,6 +201,12 @@
+@@ -201,6 +201,15 @@
                                       '/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)]
++    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.join(sys.prefix, 'lib') not in default_lib_dirs:
      default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))

=== modified file 'numpy/distutils/system_info.py'
--- numpy/distutils/system_info.py	2012-02-11 12:55:21 +0000
+++ numpy/distutils/system_info.py	2012-03-18 21:26:18 +0000
@@ -201,12 +201,15 @@
                                      '/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)]
+    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.join(sys.prefix, 'lib') not in default_lib_dirs:
     default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))