diff options
author | acxz | 2020-05-24 11:40:37 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:40:37 -0400 |
commit | f80f866f0db2ad960018f385904a245efaa1edfe (patch) | |
tree | 6d8d40f88a2bb7399e7fde229ec7af10be7f90ab | |
parent | 54db4d28efe45470f6ce6b7bc2e62b68311da3cb (diff) | |
download | aur-f80f866f0db2ad960018f385904a245efaa1edfe.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 23 |
2 files changed, 15 insertions, 22 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-executive-smach +pkgbase = ros-noetic-executive-smach pkgdesc = ROS - This metapackage depends on the SMACH library and ROS SMACH integration packages. pkgver = 2.0.1 pkgrel = 2 @@ -7,12 +7,12 @@ pkgbase = ros-melodic-executive-smach license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-smach-msgs - depends = ros-melodic-smach - depends = ros-melodic-smach-ros - source = ros-melodic-executive-smach-2.0.1.tar.gz::https://github.com/ros/executive_smach/archive/2.0.1.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-smach-msgs + depends = ros-noetic-smach + depends = ros-noetic-smach-ros + source = ros-noetic-executive-smach-2.0.1.tar.gz::https://github.com/ros/executive_smach/archive/2.0.1.tar.gz sha256sums = 2f7f58064c960fc56de15fdedfd883f62122bd44874787f13c8b4d8a77c45380 -pkgname = ros-melodic-executive-smach +pkgname = ros-noetic-executive-smach @@ -3,7 +3,7 @@ pkgdesc="ROS - This metapackage depends on the SMACH library and ROS SMACH integration packages." url='https://wiki.ros.org/executive_smach' -pkgname='ros-melodic-executive-smach' +pkgname='ros-noetic-executive-smach' pkgver='2.0.1' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,9 +21,9 @@ makedepends=( ) ros_depends=( - ros-melodic-smach-msgs - ros-melodic-smach - ros-melodic-smach-ros + ros-noetic-smach-msgs + ros-noetic-smach + ros-noetic-smach-ros ) depends=( @@ -37,24 +37,17 @@ sha256sums=('2f7f58064c960fc56de15fdedfd883f62122bd44874787f13c8b4d8a77c45380') 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 } |