diff options
author | acxz | 2020-05-24 11:48:57 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:48:57 -0400 |
commit | f2b9290660160d5984bb734ecbbb5b5be4bb72ca (patch) | |
tree | 0c91019eb7565b2baf74c1257ad857d681bf1d83 | |
parent | 51298b4396dd470283ba0681d25e647cef50f1dc (diff) | |
download | aur-f2b9290660160d5984bb734ecbbb5b5be4bb72ca.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 30 |
2 files changed, 24 insertions, 28 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-joint-limits-interface +pkgbase = ros-noetic-joint-limits-interface pkgdesc = ROS - Interface for enforcing joint limits. pkgver = 0.15.1 pkgrel = 3 @@ -11,18 +11,18 @@ pkgbase = ros-melodic-joint-limits-interface license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-urdf - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-hardware-interface - makedepends = ros-melodic-catkin - makedepends = ros-melodic-rostest + makedepends = ros-noetic-urdf + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-hardware-interface + makedepends = ros-noetic-catkin + makedepends = ros-noetic-rostest makedepends = urdfdom - depends = ros-melodic-urdf - depends = ros-melodic-roscpp - depends = ros-melodic-hardware-interface + depends = ros-noetic-urdf + depends = ros-noetic-roscpp + depends = ros-noetic-hardware-interface depends = urdfdom - source = ros-melodic-joint-limits-interface-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz + source = ros-noetic-joint-limits-interface-0.15.1.tar.gz::https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz sha256sums = adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca -pkgname = ros-melodic-joint-limits-interface +pkgname = ros-noetic-joint-limits-interface @@ -3,30 +3,30 @@ pkgdesc="ROS - Interface for enforcing joint limits." url='https://github.com/ros-controls/ros_control/wiki' -pkgname='ros-melodic-joint-limits-interface' +pkgname='ros-noetic-joint-limits-interface' pkgver='0.15.1' _pkgver_patch=0 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=3 license=('BSD') -ros_makedepends=(ros-melodic-urdf - ros-melodic-roscpp - ros-melodic-hardware-interface - ros-melodic-catkin - ros-melodic-rostest) +ros_makedepends=(ros-noetic-urdf + ros-noetic-roscpp + ros-noetic-hardware-interface + ros-noetic-catkin + ros-noetic-rostest) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} urdfdom) -ros_depends=(ros-melodic-urdf - ros-melodic-roscpp - ros-melodic-hardware-interface) +ros_depends=(ros-noetic-urdf + ros-noetic-roscpp + ros-noetic-hardware-interface) depends=(${ros_depends[@]} urdfdom) # Git version (e.g. for debugging) -# _tag=release/melodic/joint_limits_interface/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/joint_limits_interface/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/ros-gbp/ros_control-release.git"#tag=${_tag}) # sha256sums=('SKIP') @@ -39,21 +39,17 @@ sha256sums=('adf1a9d1fd10f4d89e91c8279d1278d9cd301767b658c143810479b2d10eedca') 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 + [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash # 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} - # Build project cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |