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 | b9988b102906cf4cd8bc990587c859f20d8f049f (patch) | |
| tree | 2eb725fa0995c6b2d6d55b387e1e048fd28a7c53 | |
| parent | e6cb400a77a09078e80854f2a36e34615c5b578a (diff) | |
| download | aur-b9988b102906cf4cd8bc990587c859f20d8f049f.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 | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 9 insertions, 9 deletions
@@ -1,15 +1,15 @@ pkgbase = ros-indigo-cpp-common pkgdesc = ROS - cpp_common contains C++ code for doing things that are not necessarily ROS related, but are useful for multiple packages. pkgver = 0.5.0 - pkgrel = 2 + pkgrel = 3 url = http://www.ros.org/wiki/cpp_common arch = any license = BSD makedepends = cmake makedepends = git makedepends = ros-build-tools - makedepends = ros-indigo-catkin makedepends = ros-indigo-console-bridge + makedepends = ros-indigo-catkin depends = ros-indigo-console-bridge source = cpp_common::git+https://github.com/ros-gbp/roscpp_core-release.git#tag=release/indigo/cpp_common/0.5.0-1 md5sums = SKIP @@ -7,11 +7,11 @@ pkgname='ros-indigo-cpp-common' pkgver='0.5.0' _pkgver_patch=1 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') -ros_makedepends=(ros-indigo-catkin - ros-indigo-console-bridge) +ros_makedepends=(ros-indigo-console-bridge + ros-indigo-catkin) makedepends=('cmake' 'git' 'ros-build-tools' ${ros_makedepends[@]}) @@ -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 } |