diff options
author | acxz | 2020-05-24 12:23:28 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:23:28 -0400 |
commit | b9ba9f1bc29990f52d45aaa671d258a89f13863c (patch) | |
tree | d69ad0c5425435c358c6ea4c8b3086e1bcae3d9c | |
parent | 0d8a6c97a6fa412b4ef55226a363ba7b109b73ec (diff) | |
download | aur-b9ba9f1bc29990f52d45aaa671d258a89f13863c.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 17 |
2 files changed, 9 insertions, 16 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-urdf-parser-plugin +pkgbase = ros-noetic-urdf-parser-plugin pkgdesc = ROS - This package contains a C++ base class for URDF parsers. pkgver = 1.13.1 pkgrel = 2 @@ -7,11 +7,11 @@ pkgbase = ros-melodic-urdf-parser-plugin license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin + makedepends = ros-noetic-catkin makedepends = urdfdom-headers depends = urdfdom-headers - source = ros-melodic-urdf-parser-plugin-1.13.1.tar.gz::https://github.com/ros/urdf/archive/1.13.1.tar.gz + source = ros-noetic-urdf-parser-plugin-1.13.1.tar.gz::https://github.com/ros/urdf/archive/1.13.1.tar.gz sha256sums = 9959b9963a5c112f71995405e8aa6d4dcf634e9f38f061ed7577d3db449179d6 -pkgname = ros-melodic-urdf-parser-plugin +pkgname = ros-noetic-urdf-parser-plugin @@ -3,7 +3,7 @@ pkgdesc="ROS - This package contains a C++ base class for URDF parsers." url='https://wiki.ros.org/urdf' -pkgname='ros-melodic-urdf-parser-plugin' +pkgname='ros-noetic-urdf-parser-plugin' pkgver='1.13.1' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -36,24 +36,17 @@ sha256sums=('9959b9963a5c112f71995405e8aa6d4dcf634e9f38f061ed7577d3db449179d6') 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 } |