diff options
author | Benjamin Chrétien | 2014-06-07 16:09:52 +0200 |
---|---|---|
committer | Benjamin Chrétien | 2014-06-07 16:09:55 +0200 |
commit | afeb05a1762f0af98acdc2362167d7dcb3c8157a (patch) | |
tree | e4b8407b2355a62dd026095170e9b2518b88bcd0 | |
parent | b34affe6dcd620a50b910acb6e422e9cdf2259af (diff) | |
download | aur-afeb05a1762f0af98acdc2362167d7dcb3c8157a.tar.gz |
indigo: use Python 2 rather than Python 3.
Since most packages are unlikely to be Python 3 ready before the
next ROS distribution, we stick to Python 2.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-indigo-console-bridge pkgdesc = ROS - Lightweight tool for forwarding output from libraries to other logging systems. pkgver = 0.2.7 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ros/console_bridge arch = any license = BSD @@ -7,7 +7,7 @@ pkgname='ros-indigo-console-bridge' pkgver='0.2.7' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=() @@ -34,16 +34,16 @@ build() { cd ${srcdir}/build # Fix Python2/Python3 conflicts - /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} + /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} # Build project cmake ${srcdir}/${_dir} \ -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ -DCMAKE_INSTALL_PREFIX=/opt/ros/indigo \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.4m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.4m.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |