mirror of
https://github.com/archlinux/aur.git
synced 2026-02-14 12:20:27 +01:00
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:
parent
31cf7e352e
commit
322bf56946
2 changed files with 8 additions and 8 deletions
4
.SRCINFO
4
.SRCINFO
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase = ros-indigo-message-runtime
|
||||
pkgdesc = ROS - Package modeling the run-time dependencies for language bindings of messages.
|
||||
pkgver = 0.4.12
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
url = http://ros.org/wiki/message_runtime
|
||||
arch = any
|
||||
license = BSD
|
||||
|
|
@ -10,9 +10,9 @@ pkgbase = ros-indigo-message-runtime
|
|||
makedepends = ros-build-tools
|
||||
makedepends = ros-indigo-catkin
|
||||
depends = ros-indigo-roscpp-serialization
|
||||
depends = ros-indigo-genpy
|
||||
depends = ros-indigo-rostime
|
||||
depends = ros-indigo-cpp-common
|
||||
depends = ros-indigo-genpy
|
||||
depends = ros-indigo-roscpp-traits
|
||||
source = message_runtime::git+https://github.com/ros-gbp/message_runtime-release.git#tag=release/indigo/message_runtime/0.4.12-0
|
||||
md5sums = SKIP
|
||||
|
|
|
|||
12
PKGBUILD
12
PKGBUILD
|
|
@ -7,7 +7,7 @@ pkgname='ros-indigo-message-runtime'
|
|||
pkgver='0.4.12'
|
||||
_pkgver_patch=0
|
||||
arch=('any')
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
license=('BSD')
|
||||
|
||||
ros_makedepends=(ros-indigo-catkin)
|
||||
|
|
@ -15,9 +15,9 @@ makedepends=('cmake' 'git' 'ros-build-tools'
|
|||
${ros_makedepends[@]})
|
||||
|
||||
ros_depends=(ros-indigo-roscpp-serialization
|
||||
ros-indigo-genpy
|
||||
ros-indigo-rostime
|
||||
ros-indigo-cpp-common
|
||||
ros-indigo-genpy
|
||||
ros-indigo-roscpp-traits)
|
||||
depends=(${ros_depends[@]})
|
||||
|
||||
|
|
@ -36,16 +36,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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue