diff options
| author | acxz | 2020-05-24 11:45:04 -0400 |
|---|---|---|
| committer | acxz | 2020-05-24 11:45:04 -0400 |
| commit | a330967b8f70deb444360c232a3e8eac73c1c79a (patch) | |
| tree | a6145a159d65017197740971c5b69b6bb3701a99 | |
| parent | 0e43e07cb453b4b0f9c241dec4a07555b5c01bfe (diff) | |
| download | aur-a330967b8f70deb444360c232a3e8eac73c1c79a.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-geometry +pkgbase = ros-noetic-geometry pkgdesc = ROS - A metapackage for geometry library suite. pkgver = 1.12.0 pkgrel = 2 @@ -7,14 +7,14 @@ pkgbase = ros-melodic-geometry license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-angles - depends = ros-melodic-kdl-conversions - depends = ros-melodic-tf-conversions - depends = ros-melodic-eigen-conversions - depends = ros-melodic-tf - source = ros-melodic-geometry-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-angles + depends = ros-noetic-kdl-conversions + depends = ros-noetic-tf-conversions + depends = ros-noetic-eigen-conversions + depends = ros-noetic-tf + source = ros-noetic-geometry-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz sha256sums = 61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4 -pkgname = ros-melodic-geometry +pkgname = ros-noetic-geometry @@ -3,7 +3,7 @@ pkgdesc="ROS - A metapackage for geometry library suite." url='https://www.wiki.ros.org/geometry' -pkgname='ros-melodic-geometry' +pkgname='ros-noetic-geometry' pkgver='1.12.0' _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-angles - ros-melodic-kdl-conversions - ros-melodic-tf-conversions - ros-melodic-eigen-conversions - ros-melodic-tf + ros-noetic-angles + ros-noetic-kdl-conversions + ros-noetic-tf-conversions + ros-noetic-eigen-conversions + ros-noetic-tf ) depends=( @@ -39,24 +39,17 @@ sha256sums=('61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4') 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 } |