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 | e5226706ee33a391c241188c21918761212c8525 (patch) | |
| tree | 463f30d19f6ed8155547c77642c9da47ee62f03d | |
| parent | 8a2d240934fa3cd3b4dc5bdf380e373212689918 (diff) | |
| download | aur-e5226706ee33a391c241188c21918761212c8525.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 | 8 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 14 insertions, 14 deletions
@@ -1,19 +1,19 @@ pkgbase = ros-indigo-roslib pkgdesc = ROS - Base dependencies and support libraries for ROS. pkgver = 1.11.1 - pkgrel = 2 + pkgrel = 3 url = http://ros.org/wiki/roslib arch = any license = BSD makedepends = cmake makedepends = git makedepends = ros-build-tools - makedepends = ros-indigo-catkin makedepends = ros-indigo-rospack + makedepends = ros-indigo-catkin makedepends = boost - depends = ros-indigo-catkin depends = ros-indigo-rospack - depends = python-rospkg + depends = ros-indigo-catkin + depends = python2-rospkg source = roslib::git+https://github.com/ros-gbp/ros-release.git#tag=release/indigo/roslib/1.11.1-1 md5sums = SKIP @@ -7,19 +7,19 @@ pkgname='ros-indigo-roslib' pkgver='1.11.1' _pkgver_patch=1 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') -ros_makedepends=(ros-indigo-catkin - ros-indigo-rospack) +ros_makedepends=(ros-indigo-rospack + ros-indigo-catkin) makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]} boost) -ros_depends=(ros-indigo-catkin - ros-indigo-rospack) +ros_depends=(ros-indigo-rospack + ros-indigo-catkin) depends=(${ros_depends[@]} - python-rospkg) + python2-rospkg) _tag=release/indigo/roslib/${pkgver}-${_pkgver_patch} _dir=roslib @@ -36,16 +36,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 } |