summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit628b699ba14b784b78e22f3a8f1e9d86ec9ac380 (patch)
tree8eda1c5361cad82f8745c5539cce8660d55b40fb
parent0b0096687378bf82c088edf07747cb470ffe35f4 (diff)
downloadaur-ros-ardent-fastrtps.tar.gz
Update to version 1.5.0-11
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
2 files changed, 8 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e8ee871e095..8c1d90aa7915 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:41:35 UTC 2017
+# Thu Dec 21 22:29:49 UTC 2017
pkgbase = ros-ardent-fastrtps
pkgdesc = ROS - Implementation of RTPS standard.
pkgver = 1.5.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-fastrtps
makedepends = cmake
makedepends = ros-build-tools
depends = ros-ardent-fastcdr
- depends = tinyxml2
depends = asio
+ depends = tinyxml2
source = ros-ardent-fastrtps-1.5.0-10.tar.gz::https://github.com/ros2-gbp/fastrtps-release/archive/release/ardent/fastrtps/1.5.0-10.tar.gz
sha256sums = d3a0f529a88d337ebebc51221091fe0670341faae68ba842f47f1ebfdb900875
diff --git a/PKGBUILD b/PKGBUILD
index 759c8745638d..3d0dc197ff67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ makedepends=('cmake' 'ros-build-tools'
ros_depends=(ros-ardent-fastcdr)
depends=(${ros_depends[@]}
- tinyxml2
- asio)
+ asio
+ tinyxml2)
# Git version (e.g. for debugging)
# _tag=release/ardent/fastrtps/${pkgver}-${_pkgver_patch}
@@ -42,17 +42,13 @@ 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
+
# 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
}