summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c91049e3b51..ca9b93d09998 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:41:42 UTC 2017
+# Thu Dec 21 22:29:49 UTC 2017
pkgbase = ros-ardent-tf2
pkgdesc = ROS - tf2 is the second generation of the transform library, which lets the user keep track of multiple coordinate frames over time.
pkgver = 0.8.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-tf2
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-console-bridge
depends = ros-ardent-geometry-msgs
+ depends = ros-ardent-console-bridge
source = ros-ardent-tf2-0.8.0-0.tar.gz::https://github.com/ros2-gbp/geometry2-release/archive/release/ardent/tf2/0.8.0-0.tar.gz
sha256sums = cffe60980d095c98839217737a37c1c75080331203640345b670c3572c3e36dc
diff --git a/PKGBUILD b/PKGBUILD
index d73555d0c50f..043b1001ebdf 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-console-bridge
- ros-ardent-geometry-msgs)
+ros_depends=(ros-ardent-geometry-msgs
+ ros-ardent-console-bridge)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -41,17 +41,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
}