[SCM] Packaging for pytango branch, master, updated. bc2ca1bd00acbf9347b265a85779ef48050da306

Frédéric-Emmanuel PICCA picca at synchrotron-soleil.fr
Wed Nov 24 09:29:42 UTC 2010


The following commit has been merged in the master branch:
commit a555ea7bfc5341c64e3d1f817d0855b1eb8f5282
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Nov 9 21:23:13 2010 +0100

    * patch for upstream

diff --git a/setup.py b/setup.py
index 7f22dd4..b844a48 100644
--- a/setup.py
+++ b/setup.py
@@ -211,7 +211,6 @@ else:
     include_dirs += [ os.path.join(BOOST_ROOT, 'include') ]
     
     libraries += [
-        'boost_python',
         'pthread',
         'rt',
         'dl',
@@ -221,6 +220,17 @@ else:
         'COS4',
     ]
 
+    # when building with multiple version of python on debian we need
+    # to link against boost_python-py25/-py26 etc...
+    import platform
+    if platform.dist()[0] in ['debian']:
+        if distutils.sysconfig.get_python_version() == '2.5':
+            libraries += ['boost_python-py25']
+        elif distutils.sysconfig.get_python_version() == '2.6':
+            libraries += ['boost_python-py26']
+    else:
+        libraries += ['boost_python']
+
     library_dirs += [ os.path.join(OMNI_ROOT, 'lib') ]
 
 

-- 
Packaging for pytango



More information about the debian-science-commits mailing list