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 | e364a9ee84e0ec9eac95b5af60fdd6e6e11493c3 (patch) | |
| tree | 75f14176070f0c18394b64849a5fc0a149f4d323 | |
| parent | f0a5f257f7c091b2b68e01c6a85f8cba9cc8f29d (diff) | |
| download | aur-e364a9ee84e0ec9eac95b5af60fdd6e6e11493c3.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 | 16 | ||||
| -rw-r--r-- | PKGBUILD | 26 |
2 files changed, 21 insertions, 21 deletions
@@ -1,25 +1,25 @@ pkgbase = ros-indigo-rospack pkgdesc = ROS - ROS Package Tool. pkgver = 2.2.3 - pkgrel = 2 + pkgrel = 3 url = http://wiki.ros.org/rospack arch = any license = BSD makedepends = cmake makedepends = git makedepends = ros-build-tools - makedepends = ros-indigo-catkin makedepends = ros-indigo-cmake-modules + makedepends = ros-indigo-catkin makedepends = gtest - makedepends = tinyxml makedepends = pkg-config makedepends = boost - makedepends = python - depends = python-catkin-pkg - depends = python-rosdep - depends = boost - depends = python + makedepends = tinyxml + makedepends = python2 + depends = python2-rosdep depends = tinyxml + depends = python2-catkin_pkg + depends = python2 + depends = boost depends = pkg-config source = rospack::git+https://github.com/ros-gbp/rospack-release.git#tag=release/indigo/rospack/2.2.3-1 md5sums = SKIP @@ -7,26 +7,26 @@ pkgname='ros-indigo-rospack' pkgver='2.2.3' _pkgver_patch=1 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') -ros_makedepends=(ros-indigo-catkin - ros-indigo-cmake-modules) +ros_makedepends=(ros-indigo-cmake-modules + ros-indigo-catkin) makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]} gtest - tinyxml pkg-config boost - python) + tinyxml + python2) ros_depends=() depends=(${ros_depends[@]} - python-catkin-pkg - python-rosdep - boost - python + python2-rosdep tinyxml + python2-catkin_pkg + python2 + boost pkg-config) _tag=release/indigo/rospack/${pkgver}-${_pkgver_patch} @@ -44,16 +44,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 } |