diff options
| author | acxz | 2020-05-24 11:52:18 -0400 |
|---|---|---|
| committer | acxz | 2020-05-24 11:52:18 -0400 |
| commit | 64fe04223c31f2b2d1e1717719929fdbfa853d3a (patch) | |
| tree | 1206c89cec5c24b10549019eb643192cbba80288 | |
| parent | fd1010ed2b9d846d102d98f41677fa981411d14f (diff) | |
| download | aur-64fe04223c31f2b2d1e1717719929fdbfa853d3a.tar.gz | |
upd to noetic, cmake vars, python
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
2 files changed, 13 insertions, 17 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-libmavconn +pkgbase = ros-noetic-libmavconn pkgdesc = ROS - MAVLink communication library. pkgver = 0.33.3 pkgrel = 2 @@ -11,17 +11,17 @@ pkgbase = ros-melodic-libmavconn license = GPLv3, LGPLv3, BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-mavlink - makedepends = ros-melodic-catkin + makedepends = ros-noetic-mavlink + makedepends = ros-noetic-catkin makedepends = boost makedepends = console-bridge - depends = ros-melodic-mavlink + depends = ros-noetic-mavlink depends = boost depends = console-bridge - source = ros-melodic-libmavconn-0.33.3.tar.gz::https://github.com/mavlink/mavros/archive/0.33.3.tar.gz + source = ros-noetic-libmavconn-0.33.3.tar.gz::https://github.com/mavlink/mavros/archive/0.33.3.tar.gz source = boost-1.70.patch sha256sums = eb4fc2439c78cdc2fa5f2d9ab81abe4f1fa54f9dd45f02b8f2440a231125118e sha256sums = d7a6c462f9328536ffd9b5b59e3a7e483fc5d403d71114bfc03024c364df233d -pkgname = ros-melodic-libmavconn +pkgname = ros-noetic-libmavconn @@ -3,20 +3,20 @@ pkgdesc="ROS - MAVLink communication library." url='https://wiki.ros.org/libmavconn' -pkgname='ros-melodic-libmavconn' +pkgname='ros-noetic-libmavconn' pkgver='0.33.3' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=2 license=('GPLv3, LGPLv3, BSD') -ros_makedepends=(ros-melodic-mavlink - ros-melodic-catkin) +ros_makedepends=(ros-noetic-mavlink + ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} boost console-bridge) -ros_depends=(ros-melodic-mavlink) +ros_depends=(ros-noetic-mavlink) depends=(${ros_depends[@]} boost console-bridge) @@ -35,21 +35,17 @@ prepare() { 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 } |