[pytango] 481/483: Fixes #705

Sandor Bodo-Merle sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:15:15 UTC 2017


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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 94cbcba78f812d07f8aab5d0f168e9c8d1926a65
Author: coutinho <coutinho at esrf.fr>
Date:   Mon May 11 11:29:06 2015 +0200

    Fixes #705
---
 doc/revision.rst | 1 +
 setup.py         | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index d4ea469..aaa1e97 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -106,6 +106,7 @@ Version history
 |          |     - `700: [pytango] useless files in the source distribution <https://sourceforge.net/p/tango-cs/bugs/700/>`_                                                       |
 |          |     - `701: Memory leak in command with list argument <https://sourceforge.net/p/tango-cs/bugs/701/>`_                                                                |
 |          |     - `704: Assertion failure when calling command with string array input type <https://sourceforge.net/p/tango-cs/bugs/704/>`_                                      |
+|          |     - `705: Support boost_python lib name on Gentoo  <https://sourceforge.net/p/tango-cs/bugs/705/>`_                                                                 |
 +----------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 8.1.6    | Bug fixes:                                                                                                                                                            |
 |          |                                                                                                                                                                       |
diff --git a/setup.py b/setup.py
index 911569e..9899bfb 100644
--- a/setup.py
+++ b/setup.py
@@ -355,12 +355,15 @@ def setup_args():
             dist_name = platform.linux_distribution()[0].lower()
             debian_based = 'debian' in dist_name or 'ubuntu' in dist_name or \
                            'mint' in dist_name
+            py_ver = platform.python_version_tuple()
             if debian_based:
                 # when building with multiple version of python on debian we need
                 # to link against boost_python-py25/-py26 etc...
                 pyver = "-py"
-                pyver += "".join(map(str, platform.python_version_tuple()[:2]))
+                pyver += "".join(map(str, py_ver[:2]))
                 boost_library_name += pyver
+            elif 'gentoo' in dist_name:
+                boost_library_name += "-" + ".".join(map(str, py_ver[:2]))
     else:
         inc_dir = os.path.join(BOOST_ROOT, 'include')
         lib_dirs = [os.path.join(BOOST_ROOT, 'lib')]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git



More information about the debian-science-commits mailing list