diff options
author | acxz | 2020-05-24 12:07:40 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:07:40 -0400 |
commit | 4c4ec73ea3687f45ceebcb3d3606c9945e17c3e9 (patch) | |
tree | da96ee00af5a0935270174fffced250c7795d741 | |
parent | ec7699fbb465b0fefc6d38058b3e3dd1949a7026 (diff) | |
download | aur-4c4ec73ea3687f45ceebcb3d3606c9945e17c3e9.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | PKGBUILD | 43 |
2 files changed, 35 insertions, 42 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-robot +pkgbase = ros-noetic-robot pkgdesc = ROS - A metapackage which extends ros_base and includes ROS libaries for any robot hardware. pkgver = 1.4.1 pkgrel = 2 @@ -7,22 +7,22 @@ pkgbase = ros-melodic-robot license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-filters - depends = ros-melodic-ros-base - depends = ros-melodic-joint-state-publisher - depends = ros-melodic-executive-smach - depends = ros-melodic-urdf-parser-plugin - depends = ros-melodic-xacro - depends = ros-melodic-diagnostics - depends = ros-melodic-robot-state-publisher - depends = ros-melodic-kdl-parser-py - depends = ros-melodic-geometry - depends = ros-melodic-urdf - depends = ros-melodic-control-msgs - depends = ros-melodic-kdl-parser - source = ros-melodic-robot-1.4.1.tar.gz::https://github.com/ros/metapackages/archive/1.4.1.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-filters + depends = ros-noetic-ros-base + depends = ros-noetic-joint-state-publisher + depends = ros-noetic-executive-smach + depends = ros-noetic-urdf-parser-plugin + depends = ros-noetic-xacro + depends = ros-noetic-diagnostics + depends = ros-noetic-robot-state-publisher + depends = ros-noetic-kdl-parser-py + depends = ros-noetic-geometry + depends = ros-noetic-urdf + depends = ros-noetic-control-msgs + depends = ros-noetic-kdl-parser + source = ros-noetic-robot-1.4.1.tar.gz::https://github.com/ros/metapackages/archive/1.4.1.tar.gz sha256sums = ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1 -pkgname = ros-melodic-robot +pkgname = ros-noetic-robot @@ -3,7 +3,7 @@ pkgdesc="ROS - A metapackage which extends ros_base and includes ROS libaries for any robot hardware." url='https://wiki.ros.org/robot' -pkgname='ros-melodic-robot' +pkgname='ros-noetic-robot' pkgver='1.4.1' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,19 +21,19 @@ makedepends=( ) ros_depends=( - ros-melodic-filters - ros-melodic-ros-base - ros-melodic-joint-state-publisher - ros-melodic-executive-smach - ros-melodic-urdf-parser-plugin - ros-melodic-xacro - ros-melodic-diagnostics - ros-melodic-robot-state-publisher - ros-melodic-kdl-parser-py - ros-melodic-geometry - ros-melodic-urdf - ros-melodic-control-msgs - ros-melodic-kdl-parser + ros-noetic-filters + ros-noetic-ros-base + ros-noetic-joint-state-publisher + ros-noetic-executive-smach + ros-noetic-urdf-parser-plugin + ros-noetic-xacro + ros-noetic-diagnostics + ros-noetic-robot-state-publisher + ros-noetic-kdl-parser-py + ros-noetic-geometry + ros-noetic-urdf + ros-noetic-control-msgs + ros-noetic-kdl-parser ) depends=( @@ -47,24 +47,17 @@ sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1') 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 } |