diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -9,8 +9,8 @@ pkgbase = ros-indigo-roslang makedepends = git makedepends = ros-build-tools makedepends = ros-indigo-catkin - depends = ros-indigo-catkin depends = ros-indigo-genmsg + depends = ros-indigo-catkin source = roslang::git+https://github.com/ros-gbp/ros-release.git#tag=release/indigo/roslang/1.11.1-1 md5sums = SKIP @@ -14,8 +14,8 @@ ros_makedepends=(ros-indigo-catkin) makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-indigo-catkin - ros-indigo-genmsg) +ros_depends=(ros-indigo-genmsg + ros-indigo-catkin) depends=(${ros_depends[@]}) _tag=release/indigo/roslang/${pkgver}-${_pkgver_patch} @@ -33,16 +33,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 } |