summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chr├ętien2014-06-07 16:09:52 +0200
committerBenjamin Chr├ętien2014-06-07 16:09:55 +0200
commit0f5fe76c9022fd60539f6944527b98b3e2a004bf (patch)
treee2ef12ab85d886483feead9c5170bea5b37a2805
parent27aceeb753df4e8520839ceebd02ef2f444b19aa (diff)
downloadaur-0f5fe76c9022fd60539f6944527b98b3e2a004bf.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--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21fac3b8538..937871ed4ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index edc76f98097..ca12821e7ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
}