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.
This commit is contained in:
Benjamin Chrétien 2014-06-07 16:09:52 +02:00
parent 23e45a731d
commit 2dc0be0af6
2 changed files with 6 additions and 6 deletions

View file

@ -1,7 +1,7 @@
pkgbase = ros-indigo-cmake-modules
pkgdesc = ROS - A common repository for CMake Modules which are not distributed with CMake but are commonly used by ROS packages.
pkgver = 0.3.1
pkgrel = 1
pkgrel = 2
url = http://www.ros.org/
arch = any
license = BSD

View file

@ -7,7 +7,7 @@ pkgname='ros-indigo-cmake-modules'
pkgver='0.3.1'
_pkgver_patch=0
arch=('any')
pkgrel=1
pkgrel=2
license=('BSD')
ros_makedepends=(ros-indigo-catkin)
@ -32,16 +32,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
}