[Python-modules-commits] [matplotlib] 05/13: adapt setup to find multiarched tk/tcl

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository matplotlib.

commit e3fad4a8a7e61f67e29f3ad2061499f3300322cf
Author: Julian Taylor <jtaylor at ubuntu.com>
Date:   Thu Oct 8 09:47:15 2015 -0700

    adapt setup to find multiarched tk/tcl
    
    Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/matplotlib/+bug/752647
    Forwarded: no, only if we upstream multiarchification
    
    Patch-Name: multiarch-tktcl.patch
---
 setupext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setupext.py b/setupext.py
index e68b8cd..f4dc33f 100755
--- a/setupext.py
+++ b/setupext.py
@@ -1395,13 +1395,16 @@ class BackendTkAgg(OptionalBackendPackage):
         except ImportError:
             return None
 
+        from distutils import sysconfig
         tcl_poss = [tcl_lib_dir,
                     os.path.normpath(os.path.join(tcl_lib_dir, '..')),
                     "/usr/lib/tcl" + str(Tkinter.TclVersion),
+                    "/usr/lib/%s/tcl%s" % (sysconfig.get_config_var('MULTIARCH'), Tkinter.TclVersion),
                     "/usr/lib"]
         tk_poss = [tk_lib_dir,
                     os.path.normpath(os.path.join(tk_lib_dir, '..')),
                    "/usr/lib/tk" + str(Tkinter.TkVersion),
+                   "/usr/lib/%s/tk%s" % (sysconfig.get_config_var('MULTIARCH'), Tkinter.TkVersion),
                    "/usr/lib"]
         for ptcl, ptk in zip(tcl_poss, tk_poss):
             tcl_config = os.path.join(ptcl, "tclConfig.sh")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git