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 | 7e30c25d7eda516b8fe591663030b7874b28fb1e (patch) | |
| tree | 7acef1353a0f7f941f69ad5cc00cff77cfc6fcb0 | |
| parent | 29bd694c75b9154c0efe7b83b229db39f24c16ef (diff) | |
| download | aur-7e30c25d7eda516b8fe591663030b7874b28fb1e.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 | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 9 insertions, 9 deletions
@@ -1,16 +1,16 @@ pkgbase = ros-indigo-roscpp-serialization pkgdesc = ROS - roscpp_serialization contains the code for serialization as described in MessagesSerializationAndAdaptingTypes. pkgver = 0.5.0 - pkgrel = 2 + pkgrel = 3 url = http://ros.org/wiki/roscpp_serialization arch = any license = BSD makedepends = cmake makedepends = git makedepends = ros-build-tools + makedepends = ros-indigo-catkin makedepends = ros-indigo-rostime makedepends = ros-indigo-cpp-common - makedepends = ros-indigo-catkin makedepends = ros-indigo-roscpp-traits depends = ros-indigo-rostime depends = ros-indigo-cpp-common @@ -7,12 +7,12 @@ pkgname='ros-indigo-roscpp-serialization' pkgver='0.5.0' _pkgver_patch=1 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') -ros_makedepends=(ros-indigo-rostime +ros_makedepends=(ros-indigo-catkin + ros-indigo-rostime ros-indigo-cpp-common - ros-indigo-catkin ros-indigo-roscpp-traits) makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]}) @@ -37,16 +37,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 } |