[Python-modules-commits] r34282 - in packages/pyzmq/trunk/debian (2 files)

[bernat at users.alioth.debian.org]

    Date: Tuesday, September 15, 2015 @ 19:09:57
  Author: bernat
Revision: 34282

Use sys._multiarch in CFFI fix patch.

Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/patches/cffi-fix.patch

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2015-09-15 17:30:15 UTC (rev 34281)
+++ packages/pyzmq/trunk/debian/changelog	2015-09-15 19:09:57 UTC (rev 34282)
@@ -1,3 +1,11 @@
+pyzmq (14.4.0-3) unstable; urgency=medium
+
+  * CFFI backend was relying on the presence of gcc to get the multiarch
+    triplet. Get this information from sys instead. This should fix the
+    autopkgtest.
+
+ -- Vincent Bernat <bernat at debian.org>  Tue, 15 Sep 2015 21:07:17 +0200
+
 pyzmq (14.4.0-2) unstable; urgency=medium
 
   * Add missing python{,3}-cffi, python-cffi-backend-dbg,

Modified: packages/pyzmq/trunk/debian/patches/cffi-fix.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2015-09-15 17:30:15 UTC (rev 34281)
+++ packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2015-09-15 19:09:57 UTC (rev 34282)
@@ -13,7 +13,7 @@
 ===================================================================
 --- pyzmq.orig/zmq/backend/cffi/__init__.py
 +++ pyzmq/zmq/backend/cffi/__init__.py
-@@ -3,6 +3,40 @@
+@@ -3,6 +3,30 @@
  # Copyright (C) PyZMQ Developers
  # Distributed under the terms of the Modified BSD License.
  
@@ -23,19 +23,9 @@
 +
 +import cffi.vengine_cpy
 +import cffi.vengine_gen
-+_ma_triplet = None
++_ma_triplet = getattr(getattr(sys, 'implementation', sys), '_multiarch', None)
 +
 +def vengine_gen_find_module(self, module_name, path, so_suffixes):
-+    global _ma_triplet
-+    if _ma_triplet is None:
-+        try:
-+            import subprocess as sp
-+            p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE)
-+            _ma_triplet = str(p.communicate()[0].decode().strip())
-+        except:
-+            import warnings
-+            warnings.warn('failed to detect multiarch paths, please install gcc')
-+
 +    for so_suffix in so_suffixes + ['.%s-%s.so' % (imp.get_tag(), _ma_triplet)]:
 +        basename = module_name + so_suffix
 +        if path is None: