summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit5e9aea21919775186f886d98abb19ed59c752171 (patch)
tree056d9a142b1c575585970ab8c21baa3cf50344cd
parentd865f89c2508a338366e77a2024439255c5827c2 (diff)
downloadaur-5e9aea21919775186f886d98abb19ed59c752171.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0bdfc25b2bd7..1da99b127ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:41:02 UTC 2017
+# Thu Dec 21 22:29:50 UTC 2017
pkgbase = ros-ardent-examples-rclcpp-minimal-composition
pkgdesc = ROS - Minimalist examples of composing nodes in the same process.
pkgver = 0.4.0
@@ -11,8 +11,8 @@ pkgbase = ros-ardent-examples-rclcpp-minimal-composition
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
depends = ros-ardent-std-msgs
- depends = ros-ardent-class-loader
depends = ros-ardent-rclcpp
+ depends = ros-ardent-class-loader
source = ros-ardent-examples-rclcpp-minimal-composition-0.4.0-0.tar.gz::https://github.com/ros2-gbp/examples-release/archive/release/ardent/examples_rclcpp_minimal_composition/0.4.0-0.tar.gz
sha256sums = ebe5b2777db1e1171ac7b2f2303e3cce28bcdce5468534c84f26c9c23df6e0ab
diff --git a/PKGBUILD b/PKGBUILD
index aa8f9d795280..7e54e3529eca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
ros_depends=(ros-ardent-std-msgs
- ros-ardent-class-loader
- ros-ardent-rclcpp)
+ ros-ardent-rclcpp
+ ros-ardent-class-loader)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -42,17 +42,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
}