diff options
| author | nick black | 2019-11-01 14:29:21 -0400 |
|---|---|---|
| committer | nick black | 2019-11-01 14:29:46 -0400 |
| commit | 5d93f321611a54823b2d3e6ab8d6af987d202d0c (patch) | |
| tree | 2359969a525ba514fd060974aef7c229727441dd | |
| parent | 97a3a0f54948b2f81f780679a1b2be67600a37d8 (diff) | |
| download | aur-5d93f321611a54823b2d3e6ab8d6af987d202d0c.tar.gz | |
new 0.3.3, use python3
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 24 |
2 files changed, 21 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = ros-melodic-rosparam-shortcuts pkgdesc = ROS - rosparam wrapper with improved error checking. - pkgver = 0.3.1 + pkgver = 0.3.3 pkgrel = 1 url = https://github.com/PickNikRobotics/rosparam_shortcuts arch = x86_64 @@ -9,10 +9,11 @@ pkgbase = ros-melodic-rosparam-shortcuts makedepends = ros-build-tools makedepends = ros-melodic-catkin makedepends = ros-melodic-eigen-conversions + makedepends = ros-melodic-roslint depends = ros-melodic-rosparam depends = ros-melodic-rosout - source = ros-melodic-rosparam-shortcuts-0.3.1.tar.gz::https://github.com/PickNikRobotics/rosparam_shortcuts/archive/0.3.1.tar.gz - sha256sums = 5b35e30a8e12c4ed6c2ad6ad8612ab1d280e5272ded4cafa567733fa4d59e073 + source = ros-melodic-rosparam-shortcuts-0.3.3.tar.gz::https://github.com/PickNikRobotics/rosparam_shortcuts/archive/0.3.3.tar.gz + sha256sums = 3022ea05b63f57209ceb0fb0df21c7c8747d8af9825949a65e94d9cb7a2ef8cc pkgname = ros-melodic-rosparam-shortcuts @@ -4,7 +4,7 @@ pkgdesc="ROS - rosparam wrapper with improved error checking." url='https://github.com/PickNikRobotics/rosparam_shortcuts' pkgname='ros-melodic-rosparam-shortcuts' -pkgver='0.3.1' +pkgver='0.3.3' arch=('x86_64') pkgrel=1 license=('unknown') @@ -12,6 +12,7 @@ license=('unknown') _ros_makedepends=( ros-melodic-catkin ros-melodic-eigen-conversions + ros-melodic-roslint ) makedepends=( @@ -29,23 +30,32 @@ depends=( ${_ros_depends[@]} ) +_dir="rosparam_shortcuts-${pkgver}/" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/PickNikRobotics/rosparam_shortcuts/archive/${pkgver}.tar.gz") -sha256sums=('5b35e30a8e12c4ed6c2ad6ad8612ab1d280e5272ded4cafa567733fa4d59e073') +sha256sums=('3022ea05b63f57209ceb0fb0df21c7c8747d8af9825949a65e94d9cb7a2ef8cc') 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 - _dir="rosparam_shortcuts-${pkgver}" - # Create the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # 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/melodic \ + -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 } |