summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit31d6211cdb1f2d666e73cdd2ebf83310b8eb192c (patch)
tree5dff4abe97fabcdc3839344998b9f64db39c38a3
parent5bf41a73bfd13f122ff4ce9ac2da10956fa14ac1 (diff)
downloadaur-ros-ardent-demo-nodes-cpp-native.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 a2323f667c1..aea654a9c1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:40:11 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-demo-nodes-cpp-native
pkgdesc = ROS - C++ nodes which access the native handles of the rmw implemenation.
pkgver = 0.4.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-demo-nodes-cpp-native
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-std-msgs
depends = ros-ardent-rmw-fastrtps-cpp
+ depends = ros-ardent-std-msgs
depends = ros-ardent-rclcpp
source = ros-ardent-demo-nodes-cpp-native-0.4.0-0.tar.gz::https://github.com/ros2-gbp/demos-release/archive/release/ardent/demo_nodes_cpp_native/0.4.0-0.tar.gz
sha256sums = 86b63c2e0d900c8b18a6585427d8f2c1f874c98169015087181f36a5dd00c9c1
diff --git a/PKGBUILD b/PKGBUILD
index 68630994a92..5f3316d9c26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-std-msgs
- ros-ardent-rmw-fastrtps-cpp
+ros_depends=(ros-ardent-rmw-fastrtps-cpp
+ ros-ardent-std-msgs
ros-ardent-rclcpp)
depends=(${ros_depends[@]})
@@ -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
}