diff options
author | acxz | 2020-05-24 11:36:22 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:36:22 -0400 |
commit | 11d84f9f1e0249c8f9542679113906939930f798 (patch) | |
tree | 9ede8678e188c12f8575b86f793f8a17012d36cf | |
parent | 8b4184ec081a6c5a9c723fe406e8104861220098 (diff) | |
download | aur-11d84f9f1e0249c8f9542679113906939930f798.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 28 |
2 files changed, 23 insertions, 27 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-diagnostic-updater +pkgbase = ros-noetic-diagnostic-updater pkgdesc = ROS - diagnostic_updater contains tools for easily updating diagnostics. pkgver = 1.9.3 pkgrel = 3 @@ -11,16 +11,16 @@ pkgbase = ros-melodic-diagnostic-updater license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-rostest - makedepends = ros-melodic-diagnostic-msgs - makedepends = ros-melodic-catkin - makedepends = ros-melodic-std-msgs - makedepends = ros-melodic-roscpp - depends = ros-melodic-std-msgs - depends = ros-melodic-roscpp - depends = ros-melodic-diagnostic-msgs - source = ros-melodic-diagnostic-updater-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz + makedepends = ros-noetic-rostest + makedepends = ros-noetic-diagnostic-msgs + makedepends = ros-noetic-catkin + makedepends = ros-noetic-std-msgs + makedepends = ros-noetic-roscpp + depends = ros-noetic-std-msgs + depends = ros-noetic-roscpp + depends = ros-noetic-diagnostic-msgs + source = ros-noetic-diagnostic-updater-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz sha256sums = 3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550 -pkgname = ros-melodic-diagnostic-updater +pkgname = ros-noetic-diagnostic-updater @@ -3,7 +3,7 @@ pkgdesc="ROS - diagnostic_updater contains tools for easily updating diagnostics." url='https://www.wiki.ros.org/diagnostic_updater' -pkgname='ros-melodic-diagnostic-updater' +pkgname='ros-noetic-diagnostic-updater' pkgver='1.9.3' _pkgver_patch=0 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') @@ -11,11 +11,11 @@ pkgrel=3 license=('BSD') ros_makedepends=( - ros-melodic-rostest - ros-melodic-diagnostic-msgs - ros-melodic-catkin - ros-melodic-std-msgs - ros-melodic-roscpp + ros-noetic-rostest + ros-noetic-diagnostic-msgs + ros-noetic-catkin + ros-noetic-std-msgs + ros-noetic-roscpp ) makedepends=( @@ -25,9 +25,9 @@ makedepends=( ) ros_depends=( - ros-melodic-std-msgs - ros-melodic-roscpp - ros-melodic-diagnostic-msgs + ros-noetic-std-msgs + ros-noetic-roscpp + ros-noetic-diagnostic-msgs ) depends=( @@ -41,21 +41,17 @@ sha256sums=('3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550') 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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |