diff options
author | acxz | 2020-05-24 12:05:19 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:05:19 -0400 |
commit | ed648656a2411b8dc0f7e1b9928c73d943829a6e (patch) | |
tree | 47a22f1e48b3bb65b3400972cd14e492f0d26c1c | |
parent | f8923d40fe8cd6bc2f214e08bc4bbb31d78db48b (diff) | |
download | aur-ed648656a2411b8dc0f7e1b9928c73d943829a6e.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 25 |
2 files changed, 17 insertions, 24 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-position-controllers +pkgbase = ros-noetic-position-controllers pkgdesc = ROS - position_controllers. pkgver = 0.15.0 pkgrel = 1 @@ -7,13 +7,13 @@ pkgbase = ros-melodic-position-controllers license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-controller-interface - makedepends = ros-melodic-catkin - makedepends = ros-melodic-forward-command-controller - depends = ros-melodic-controller-interface - depends = ros-melodic-forward-command-controller - source = ros-melodic-position-controllers-0.15.0.tar.gz::https://github.com/ros-controls/ros_controllers/archive/0.15.0.tar.gz + makedepends = ros-noetic-controller-interface + makedepends = ros-noetic-catkin + makedepends = ros-noetic-forward-command-controller + depends = ros-noetic-controller-interface + depends = ros-noetic-forward-command-controller + source = ros-noetic-position-controllers-0.15.0.tar.gz::https://github.com/ros-controls/ros_controllers/archive/0.15.0.tar.gz sha256sums = 8c19481a28f394d5bf4372fb05a6c638fa2995614f9b0f82b8213ca32d15a4cf -pkgname = ros-melodic-position-controllers +pkgname = ros-noetic-position-controllers @@ -3,7 +3,7 @@ pkgdesc="ROS - position_controllers." url='https://github.com/ros-controls/ros_controllers/wiki' -pkgname='ros-melodic-position-controllers' +pkgname='ros-noetic-position-controllers' pkgver='0.15.0' _pkgver_patch=0 arch=('any') @@ -11,9 +11,9 @@ pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-controller-interface - ros-melodic-catkin - ros-melodic-forward-command-controller + ros-noetic-controller-interface + ros-noetic-catkin + ros-noetic-forward-command-controller ) makedepends=( @@ -23,8 +23,8 @@ makedepends=( ) ros_depends=( - ros-melodic-controller-interface - ros-melodic-forward-command-controller + ros-noetic-controller-interface + ros-noetic-forward-command-controller ) depends=( @@ -38,24 +38,17 @@ sha256sums=('8c19481a28f394d5bf4372fb05a6c638fa2995614f9b0f82b8213ca32d15a4cf') 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 the 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 the project. cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |