summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD23
2 files changed, 14 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c863baf9ebb0..78adb1bfb1ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:42:24 UTC 2017
+# Thu Dec 21 22:29:51 UTC 2017
pkgbase = ros-ardent-map-server
pkgdesc = ROS - map_server provides the map_server ROS Node, which offers map data as a ROS Service.
pkgver = 3.0.0
@@ -9,15 +9,15 @@ pkgbase = ros-ardent-map-server
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-nav-msgs
makedepends = ros-ardent-ament-cmake
makedepends = ros-ardent-geometry-msgs
depends = ros-ardent-rcutils
- depends = ros-ardent-tf2
depends = ros-ardent-rclcpp
+ depends = ros-ardent-tf2
+ depends = ros-ardent-nav-msgs
depends = sdl
- depends = yaml-cpp
depends = sdl_image
+ depends = yaml-cpp
source = ros-ardent-map-server-3.0.0-0.tar.gz::https://github.com/ros2-gbp/navigation-release/archive/release/ardent/map_server/3.0.0-0.tar.gz
sha256sums = ab0b452f2d068f83d221e45d2df15419c11b9bf6fd2dd38c7d9e4c2ca9fb09e3
diff --git a/PKGBUILD b/PKGBUILD
index e2e5b9a0efc3..18005f9a60e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,19 +10,19 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-ardent-nav-msgs
- ros-ardent-ament-cmake
+ros_makedepends=(ros-ardent-ament-cmake
ros-ardent-geometry-msgs)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
ros_depends=(ros-ardent-rcutils
+ ros-ardent-rclcpp
ros-ardent-tf2
- ros-ardent-rclcpp)
+ ros-ardent-nav-msgs)
depends=(${ros_depends[@]}
sdl
- yaml-cpp
- sdl_image)
+ sdl_image
+ yaml-cpp)
# Git version (e.g. for debugging)
# _tag=release/ardent/map_server/${pkgver}-${_pkgver_patch}
@@ -47,17 +47,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
}