summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:54 +0100
committerTim Rakowski2017-12-21 23:29:54 +0100
commit781b81bb32b1b6d1b4367720c9fb3d15c9e963ef (patch)
tree839ba3f81335580c4af4734f61a218058c5644a1
parentb362bd1386361b380833831f0045bafc57f3a96d (diff)
downloadaur-781b81bb32b1b6d1b4367720c9fb3d15c9e963ef.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD20
2 files changed, 12 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57a96cad3c8..d8172d49d4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:25:43 UTC 2017
+# Thu Dec 21 22:29:46 UTC 2017
pkgbase = ros-ardent-ament-cmake-core
pkgdesc = ROS - The core of the ament buildsystem in CMake.
pkgver = 0.4.0
@@ -9,7 +9,8 @@ pkgbase = ros-ardent-ament-cmake-core
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-ament-package
+ depends = ros-ardent-ament-package
+ depends = cmake
source = ros-ardent-ament-cmake-core-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_cmake-release/archive/release/ardent/ament_cmake_core/0.4.0-0.tar.gz
sha256sums = 36fcbc8dcd7571b935c9f765d36ea73a76ffe00577ba1eb83182bf058a4e47c5
diff --git a/PKGBUILD b/PKGBUILD
index 00246776079..dc461d1aa91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,13 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-package)
+ros_makedepends=()
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=()
-depends=(${ros_depends[@]})
+ros_depends=(ros-ardent-ament-package)
+depends=(${ros_depends[@]}
+ cmake)
# Git version (e.g. for debugging)
# _tag=release/ardent/ament_cmake_core/${pkgver}-${_pkgver_patch}
@@ -40,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
}