summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit5e5929f4b2769f802e8923c9b10cf40bcc76ff57 (patch)
tree7c704195bf6309d6c384a31014bb59f22416b2e0
parent8954c6edf103bc9265e27086e0373c84fe53bb56 (diff)
downloadaur-ros-ardent-intra-process-demo.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
2 files changed, 12 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c8e1efad1bf..bd5c3afea0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:40:31 UTC 2017
+# Thu Dec 21 22:29:47 UTC 2017
pkgbase = ros-ardent-intra-process-demo
pkgdesc = ROS - Demonstrations of intra process communication.
pkgver = 0.4.0
@@ -9,10 +9,10 @@ pkgbase = ros-ardent-intra-process-demo
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-ament-cmake
makedepends = ros-ardent-std-msgs
- depends = ros-ardent-rclcpp
+ makedepends = ros-ardent-ament-cmake
depends = ros-ardent-sensor-msgs
+ depends = ros-ardent-rclcpp
depends = opencv
source = ros-ardent-intra-process-demo-0.4.0-0.tar.gz::https://github.com/ros2-gbp/demos-release/archive/release/ardent/intra_process_demo/0.4.0-0.tar.gz
sha256sums = cce0e4ef170c8a7570931cb50f36aa2fa6d2a79d955d944565e4bf50489f238c
diff --git a/PKGBUILD b/PKGBUILD
index 394b5cf2cc1..6669f1532ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,13 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-cmake
- ros-ardent-std-msgs)
+ros_makedepends=(ros-ardent-std-msgs
+ ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rclcpp
- ros-ardent-sensor-msgs)
+ros_depends=(ros-ardent-sensor-msgs
+ ros-ardent-rclcpp)
depends=(${ros_depends[@]}
opencv)
@@ -43,17 +43,14 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
+ export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+ export AMENT_PREFIX_PATH=/opt/ros/ardent
+
# Build project
cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
- -DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
- -DPYTHON_BASENAME=.cpython-35m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCATKIN_ENABLE_TESTING=OFF
+ -DBUILD_TESTING=Off \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
make
}