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 | a16dc8453637f034bfb1cb60c99f04535e5b61b6 (patch) | |
| tree | 5a8ea9aec2bd80199265fb1b2467fae88af2652b /PKGBUILD | |
| parent | f7e04a036b18ee6f41da656f12d3e77fb2283f5d (diff) | |
| download | aur-a16dc8453637f034bfb1cb60c99f04535e5b61b6.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.
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -7,23 +7,23 @@ pkgname='ros-indigo-catkin' pkgver='0.6.6' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=() makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]} - python-catkin-pkg - python-empy - python) + python2-catkin_pkg + python2-empy + python2) ros_depends=() depends=(${ros_depends[@]} gtest - python-nose - python-catkin-pkg - python-empy - python) + python2-nose + python2-catkin_pkg + python2-empy + python2) _tag=release/indigo/catkin/${pkgver}-${_pkgver_patch} _dir=catkin @@ -40,16 +40,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=OFF \ -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 } |