diff options
author | acxz | 2020-05-24 12:19:54 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:19:54 -0400 |
commit | 5ea71a6b48c74ceb18373aa82cd873a843183c2e (patch) | |
tree | 15668ea3481b98b72d1797aa0b6378825fa0155e | |
parent | 11f2cdc85085846bd57664c21fea6a9f4741a1a2 (diff) | |
download | aur-5ea71a6b48c74ceb18373aa82cd873a843183c2e.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-tf2-eigen +pkgbase = ros-noetic-tf2-eigen pkgdesc = ROS - tf2_eigen. pkgver = 0.6.5 pkgrel = 2 @@ -7,16 +7,16 @@ pkgbase = ros-melodic-tf2-eigen license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-tf2 - makedepends = ros-melodic-catkin - makedepends = ros-melodic-geometry-msgs - makedepends = ros-melodic-cmake-modules + makedepends = ros-noetic-tf2 + makedepends = ros-noetic-catkin + makedepends = ros-noetic-geometry-msgs + makedepends = ros-noetic-cmake-modules makedepends = eigen3 - depends = ros-melodic-tf2 - depends = ros-melodic-geometry-msgs + depends = ros-noetic-tf2 + depends = ros-noetic-geometry-msgs depends = eigen3 - source = ros-melodic-tf2-eigen-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz + source = ros-noetic-tf2-eigen-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz sha256sums = 9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a -pkgname = ros-melodic-tf2-eigen +pkgname = ros-noetic-tf2-eigen @@ -3,7 +3,7 @@ pkgdesc="ROS - tf2_eigen." url='https://wiki.ros.org/tf2_eigen' -pkgname='ros-melodic-tf2-eigen' +pkgname='ros-noetic-tf2-eigen' pkgver='0.6.5' _pkgver_patch=0 arch=('any') @@ -11,10 +11,10 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-tf2 - ros-melodic-catkin - ros-melodic-geometry-msgs - ros-melodic-cmake-modules + ros-noetic-tf2 + ros-noetic-catkin + ros-noetic-geometry-msgs + ros-noetic-cmake-modules ) makedepends=( @@ -25,8 +25,8 @@ makedepends=( ) ros_depends=( - ros-melodic-tf2 - ros-melodic-geometry-msgs + ros-noetic-tf2 + ros-noetic-geometry-msgs ) depends=( @@ -41,24 +41,17 @@ sha256sums=('9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a') 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 } |