diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 14 insertions, 20 deletions
@@ -1,17 +1,17 @@ -pkgbase = ros-melodic-rosmake +pkgbase = ros-noetic-rosmake pkgdesc = ROS - rosmake is a ros dependency aware build tool which can be used to build all dependencies in the correct order. - pkgver = 1.14.6 + pkgver = 1.15.2 pkgrel = 1 url = https://wiki.ros.org/rosmake arch = any license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-catkin + makedepends = ros-noetic-catkin + depends = ros-noetic-catkin depends = python-rospkg - source = ros-melodic-rosmake-1.14.6.tar.gz::https://github.com/ros/ros/archive/1.14.6.tar.gz - sha256sums = 62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c + source = ros-noetic-rosmake-1.15.2.tar.gz::https://github.com/ros/ros/archive/1.15.2.tar.gz + sha256sums = 596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e -pkgname = ros-melodic-rosmake +pkgname = ros-noetic-rosmake @@ -3,14 +3,14 @@ pkgdesc="ROS - rosmake is a ros dependency aware build tool which can be used to build all dependencies in the correct order." url='https://wiki.ros.org/rosmake' -pkgname='ros-melodic-rosmake' -pkgver='1.14.6' +pkgname='ros-noetic-rosmake' +pkgver='1.15.2' arch=('any') pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -20,7 +20,7 @@ makedepends=( ) ros_depends=( - ros-melodic-catkin + ros-noetic-catkin ) depends=( @@ -30,29 +30,23 @@ depends=( _dir="ros-${pkgver}/tools/rosmake" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros/archive/${pkgver}.tar.gz") -sha256sums=('62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c') +sha256sums=('596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e') 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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |