diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:22:51 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:22:51 +0200 |
commit | 8e524ff0c13eed362ab6264b8201d6262563e99a (patch) | |
tree | 5879f615486cd48fb2f9cf88c1297156799a9c60 | |
parent | 7f902ce9db070a62a4029c3ffca90399b824d5c3 (diff) | |
download | aur-8e524ff0c13eed362ab6264b8201d6262563e99a.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 105 |
2 files changed, 51 insertions, 64 deletions
@@ -10,14 +10,14 @@ pkgbase = ros-melodic-catkin makedepends = python-catkin_pkg makedepends = python-empy makedepends = python - depends = python-empy - depends = python depends = python-nose - depends = python-catkin_pkg depends = gmock + depends = python-empy depends = gtest - source = ros-melodic-catkin::git+https://github.com/ros-gbp/catkin-release.git - sha256sums = SKIP + depends = python-catkin_pkg + depends = python + source = ros-melodic-catkin-0.7.14-0.tar.gz::https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/0.7.14-0.tar.gz + sha256sums = 3297a9b5e2afa50c00e87ecc56b181d08fc6a6bbe4e7e71a112402fab03fd445 pkgname = ros-melodic-catkin @@ -1,5 +1,5 @@ -# Script generated with import_catkin_packages.py. -# For more information: https://github.com/bchretien/arch-ros-stacks. +# Script generated with import_catkin_packages.py +# For more information: https://github.com/bchretien/arch-ros-stacks pkgdesc="ROS - Low-level build system macros and infrastructure for ROS." url='http://www.ros.org/wiki/catkin' @@ -10,72 +10,59 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( -) +ros_makedepends=() +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + python-catkin_pkg + python-empy + python) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - python-catkin_pkg - python-empy - python -) +ros_depends=() +depends=(${ros_depends[@]} + python-nose + gmock + python-empy + gtest + python-catkin_pkg + python) -ros_depends=( -) +# Git version (e.g. for debugging) +# _tag=release/melodic/catkin/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/catkin-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - python-empy - python - python-nose - python-catkin_pkg - gmock - gtest -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/catkin-release.git") -sha256sums=('SKIP') - -prepare() { - cd ${srcdir}/${_dir} - git checkout upstream - _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') - - if [ -d ${_pkgname} ]; then - git subtree split -P ${_pkgname} --branch ${_pkgname} - git checkout ${_pkgname} - fi -} +# Tarball version (faster download) +_dir="catkin-release-release-melodic-catkin-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('3297a9b5e2afa50c00e87ecc56b181d08fc6a6bbe4e7e71a112402fab03fd445') build() { - # Use ROS environment variables. - source /usr/share/ros-build-tools/clear-ros-env.sh - [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash + # Use ROS environment variables + source /usr/share/ros-build-tools/clear-ros-env.sh + [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash - # Create the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create build directory + [ -d ${srcdir}/build ] || mkdir ${srcdir}/build + cd ${srcdir}/build - # Fix Python2/Python3 conflicts. - /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # Build the project. - cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=OFF \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # Build project + cmake ${srcdir}/${_dir} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCATKIN_BUILD_BINARY_PACKAGE=OFF \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ + -DPYTHON_BASENAME=.cpython-37m \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |