summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-10-05 00:54:38 +0200
committerBenjamin Chrétien2015-06-20 02:25:13 +0900
commit6bfb33a912cca44418042e77b969ebc867a372ae (patch)
tree1625313add73e464de1c5f134a4843e0faba6fb8
parentb670b1c1aec59ba32cd0d59efa25eb905d983af3 (diff)
downloadaur-6bfb33a912cca44418042e77b969ebc867a372ae.tar.gz
indigo: desktop_full update.
Also fix for PySide.
-rwxr-xr-ximport_catkin_packages.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index d350c4ec9cdf..ca96e3b7901f 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -260,6 +260,7 @@ build() {
-DPYTHON_EXECUTABLE=%(python_executable)s \\
-DPYTHON_INCLUDE_DIR=%(python_include_dir)s \\
-DPYTHON_LIBRARY=%(python_library)s \\
+ -DPYTHON_BASENAME=%(python_basename)s \\
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}
@@ -289,6 +290,14 @@ package() {
if python_version_major == "3":
python_version_full = "%s%s" % (python_version_full, "m")
+ # PYTHON_BASENAME for PySide:
+ # If Python 2.7
+ python_basename = "-lpython2.7"
+ if python_version_major == "3":
+ # If Python 3.4: .cpython-34m
+ python_basename = ".cpython-%s" % (python_version_full.replace(".", ""))
+
+
pkgbuild = self.BUILD_TEMPLATE % {
'distro': self.distro.name,
'arch_package_name': self._rosify_package_name(self.name),
@@ -307,7 +316,8 @@ package() {
'python_version_major': python_version_major,
'python_executable': '/usr/bin/python%s' % python_version_major,
'python_include_dir': '/usr/include/python%s' % python_version_full,
- 'python_library': '/usr/lib/libpython%s.so' % python_version_full
+ 'python_library': '/usr/lib/libpython%s.so' % python_version_full,
+ 'python_basename': python_basename
}
# Post-processing: