diff options
author | acxz | 2020-05-24 11:35:53 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:35:53 -0400 |
commit | 38ea3f0067310d8e94a94949f453c68983a68a27 (patch) | |
tree | 565c5fa883a685592eb9084ef1046b158c7fc313 | |
parent | b877c6629150b067a2852fc025c142aaffbe16af (diff) | |
download | aur-38ea3f0067310d8e94a94949f453c68983a68a27.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 27 |
2 files changed, 19 insertions, 26 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-diagnostics +pkgbase = ros-noetic-diagnostics pkgdesc = ROS - diagnostics. pkgver = 1.9.3 pkgrel = 2 @@ -7,14 +7,14 @@ pkgbase = ros-melodic-diagnostics license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-diagnostic-updater - depends = ros-melodic-diagnostic-analysis - depends = ros-melodic-diagnostic-common-diagnostics - depends = ros-melodic-diagnostic-aggregator - depends = ros-melodic-self-test - source = ros-melodic-diagnostics-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-diagnostic-updater + depends = ros-noetic-diagnostic-analysis + depends = ros-noetic-diagnostic-common-diagnostics + depends = ros-noetic-diagnostic-aggregator + depends = ros-noetic-self-test + source = ros-noetic-diagnostics-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz sha256sums = 3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550 -pkgname = ros-melodic-diagnostics +pkgname = ros-noetic-diagnostics @@ -3,7 +3,7 @@ pkgdesc="ROS - diagnostics." url='https://www.wiki.ros.org/diagnostics' -pkgname='ros-melodic-diagnostics' +pkgname='ros-noetic-diagnostics' pkgver='1.9.3' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,11 +21,11 @@ makedepends=( ) ros_depends=( - ros-melodic-diagnostic-updater - ros-melodic-diagnostic-analysis - ros-melodic-diagnostic-common-diagnostics - ros-melodic-diagnostic-aggregator - ros-melodic-self-test + ros-noetic-diagnostic-updater + ros-noetic-diagnostic-analysis + ros-noetic-diagnostic-common-diagnostics + ros-noetic-diagnostic-aggregator + ros-noetic-self-test ) depends=( @@ -39,24 +39,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 \ - -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 } |