diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -7,7 +7,7 @@ pkgname='ros-indigo-rosbuild' pkgver='1.11.1' _pkgver_patch=1 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') ros_makedepends=(ros-indigo-catkin) @@ -15,9 +15,9 @@ makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]} pkg-config) -ros_depends=(ros-indigo-catkin - ros-indigo-message-generation - ros-indigo-message-runtime) +ros_depends=(ros-indigo-message-generation + ros-indigo-message-runtime + ros-indigo-catkin) depends=(${ros_depends[@]}) _tag=release/indigo/rosbuild/${pkgver}-${_pkgver_patch} @@ -35,16 +35,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 } |