summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chr├ętien2014-06-07 16:09:52 +0200
committerBenjamin Chr├ętien2014-06-07 16:09:55 +0200
commitc44373933825693b6a7dc7a94f5efe59013ac217 (patch)
tree0a5c3177f208c6fb59e4bce57cd674d58f9882ad
parentacdfe2d78420e944f4e017eaf5e4de30707988d2 (diff)
downloadaur-c44373933825693b6a7dc7a94f5efe59013ac217.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--.SRCINFO14
-rw-r--r--PKGBUILD24
2 files changed, 19 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 52a054968dd..bf773c2eabe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-indigo-ros
pkgdesc = ROS - ROS packaging system.
pkgver = 1.11.1
- pkgrel = 2
+ pkgrel = 3
url = http://www.ros.org/wiki/ROS
arch = any
license = BSD
@@ -10,16 +10,16 @@ pkgbase = ros-indigo-ros
makedepends = ros-build-tools
makedepends = ros-indigo-catkin
depends = ros-indigo-rosmake
- depends = ros-indigo-rosclean
- depends = ros-indigo-rosbuild
- depends = ros-indigo-rosunit
- depends = ros-indigo-roslib
- depends = ros-indigo-mk
- depends = ros-indigo-catkin
depends = ros-indigo-roslang
+ depends = ros-indigo-rosunit
depends = ros-indigo-roscreate
+ depends = ros-indigo-catkin
depends = ros-indigo-rosboost-cfg
+ depends = ros-indigo-rosclean
+ depends = ros-indigo-rosbuild
+ depends = ros-indigo-roslib
depends = ros-indigo-rosbash
+ depends = ros-indigo-mk
source = ros::git+https://github.com/ros-gbp/ros-release.git#tag=release/indigo/ros/1.11.1-1
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c387cc5480e..8623a4cc668 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-indigo-ros'
pkgver='1.11.1'
_pkgver_patch=1
arch=('any')
-pkgrel=2
+pkgrel=3
license=('BSD')
ros_makedepends=(ros-indigo-catkin)
@@ -15,16 +15,16 @@ makedepends=('cmake' 'git' 'ros-build-tools'
${ros_makedepends[@]})
ros_depends=(ros-indigo-rosmake
- ros-indigo-rosclean
- ros-indigo-rosbuild
- ros-indigo-rosunit
- ros-indigo-roslib
- ros-indigo-mk
- ros-indigo-catkin
ros-indigo-roslang
+ ros-indigo-rosunit
ros-indigo-roscreate
+ ros-indigo-catkin
ros-indigo-rosboost-cfg
- ros-indigo-rosbash)
+ ros-indigo-rosclean
+ ros-indigo-rosbuild
+ ros-indigo-roslib
+ ros-indigo-rosbash
+ ros-indigo-mk)
depends=(${ros_depends[@]})
_tag=release/indigo/ros/${pkgver}-${_pkgver_patch}
@@ -42,16 +42,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
}