summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit4224d52b438147f4322e02d67a615da8eea57de9 (patch)
tree316eaa57109850f4e6dc63674efb3286a73d91cf
parent08b43f94ca35435631577d73e73c2134f1116292 (diff)
downloadaur-ros-ardent-resource-retriever.tar.gz
Update to version 2.0.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb22b67c230..6ee26132d2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:43:22 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-resource-retriever
pkgdesc = ROS - This package retrieves data from url-format files such as http://, ftp://, package:// file://, etc., and loads the data into memory.
pkgver = 2.0.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-resource-retriever
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake-ros
- depends = ros-ardent-libcurl-vendor
depends = ros-ardent-ament-index-cpp
+ depends = ros-ardent-libcurl-vendor
source = ros-ardent-resource-retriever-2.0.0-0.tar.gz::https://github.com/ros2-gbp/resource_retriever-release/archive/release/ardent/resource_retriever/2.0.0-0.tar.gz
sha256sums = d0fc7b359fd2ff0935002191e603a418898ff88a2acc0b908764131fc5e70c23
diff --git a/PKGBUILD b/PKGBUILD
index f4d8a44685f..321ad4f9c08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=(ros-ardent-ament-cmake-ros)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-libcurl-vendor
- ros-ardent-ament-index-cpp)
+ros_depends=(ros-ardent-ament-index-cpp
+ ros-ardent-libcurl-vendor)
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
}