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 bb019e021aad..b15899b7f2eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:39:48 UTC 2017
+# Thu Dec 21 22:29:49 UTC 2017
pkgbase = ros-ardent-std-srvs
pkgdesc = ROS - A package containing some standard service definitions.
pkgver = 0.4.0
@@ -9,8 +9,8 @@ pkgbase = ros-ardent-std-srvs
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-ament-cmake
makedepends = ros-ardent-rosidl-default-generators
+ makedepends = ros-ardent-ament-cmake
depends = ros-ardent-rosidl-default-runtime
source = ros-ardent-std-srvs-0.4.0-0.tar.gz::https://github.com/ros2-gbp/common_interfaces-release/archive/release/ardent/std_srvs/0.4.0-0.tar.gz
sha256sums = 083c26a2225cff385043c2c74623dd85997f9630cac57614e5720ac79f07b164
diff --git a/PKGBUILD b/PKGBUILD
index 43d507f063d6..97918555dd5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-cmake
- ros-ardent-rosidl-default-generators)
+ros_makedepends=(ros-ardent-rosidl-default-generators
+ ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
@@ -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
}