summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chr├ętien2014-06-07 16:09:52 +0200
committerBenjamin Chr├ętien2014-06-07 16:09:55 +0200
commita16dc8453637f034bfb1cb60c99f04535e5b61b6 (patch)
tree5a8ea9aec2bd80199265fb1b2467fae88af2652b
parentf7e04a036b18ee6f41da656f12d3e77fb2283f5d (diff)
downloadaur-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.
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD24
2 files changed, 20 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46005eea3d8..58c686f2f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
pkgbase = ros-indigo-catkin
pkgdesc = ROS - Low-level build system macros and infrastructure for ROS.
pkgver = 0.6.6
- pkgrel = 1
+ pkgrel = 2
url = http://www.ros.org/wiki/catkin
arch = any
license = BSD
makedepends = cmake
makedepends = git
makedepends = ros-build-tools
- makedepends = python-catkin-pkg
- makedepends = python-empy
- makedepends = python
+ makedepends = python2-catkin_pkg
+ makedepends = python2-empy
+ makedepends = python2
depends = gtest
- depends = python-nose
- depends = python-catkin-pkg
- depends = python-empy
- depends = python
+ depends = python2-nose
+ depends = python2-catkin_pkg
+ depends = python2-empy
+ depends = python2
source = catkin::git+https://github.com/ros-gbp/catkin-release.git#tag=release/indigo/catkin/0.6.6-0
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 29b8044638f..92c922b23fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
}