diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:55:54 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:55:54 +0200 |
commit | 5280245413181eda2f9ddf90e46df7312f4c3414 (patch) | |
tree | 9778a0baf3ea6c1bbff2ba940c9910be439d175e | |
parent | 2b52677a889178baecc4e8c6fad772b26c083de3 (diff) | |
download | aur-5280245413181eda2f9ddf90e46df7312f4c3414.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 99 |
2 files changed, 62 insertions, 47 deletions
@@ -8,14 +8,14 @@ pkgbase = ros-melodic-python-orocos-kdl makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-orocos-kdl + makedepends = python-sip makedepends = sip - makedepends = python2-sip - depends = ros-melodic-orocos-kdl depends = ros-melodic-catkin + depends = ros-melodic-orocos-kdl + depends = python-sip depends = sip - depends = python2-sip - source = ros-melodic-python-orocos-kdl-1.4.0-0.tar.gz::https://github.com/orocos/orocos-kdl-release/archive/release/melodic/python_orocos_kdl/1.4.0-0.tar.gz - sha256sums = e2f7f6fafccaf26d88863ac50b826301c14db71f61e4caff757a482e304a62a0 + source = ros-melodic-python-orocos-kdl::git+https://github.com/orocos/orocos-kdl-release.git + sha256sums = SKIP pkgname = ros-melodic-python-orocos-kdl @@ -1,5 +1,5 @@ -# Script generated with import_catkin_packages.py -# For more information: https://github.com/bchretien/arch-ros-stacks +# Script generated with import_catkin_packages.py. +# For more information: https://github.com/bchretien/arch-ros-stacks. pkgdesc="ROS - This package contains the python bindings PyKDL for the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project." url='http://wiki.ros.org/python_orocos_kdl' @@ -10,55 +10,70 @@ arch=('any') pkgrel=1 license=('LGPL') -ros_makedepends=(ros-melodic-orocos-kdl) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - sip - python2-sip) +ros_makedepends=( + ros-melodic-orocos-kdl +) -ros_depends=(ros-melodic-orocos-kdl - ros-melodic-catkin) -depends=(${ros_depends[@]} - sip - python2-sip) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + python-sip + sip +) -# Git version (e.g. for debugging) -# _tag=release/melodic/python_orocos_kdl/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/orocos/orocos-kdl-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-catkin + ros-melodic-orocos-kdl +) -# Tarball version (faster download) -_dir="orocos-kdl-release-release-melodic-python_orocos_kdl-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/orocos/orocos-kdl-release/archive/release/melodic/python_orocos_kdl/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('e2f7f6fafccaf26d88863ac50b826301c14db71f61e4caff757a482e304a62a0') +depends=( + ${ros_depends[@]} + python-sip + sip +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/orocos/orocos-kdl-release.git") +sha256sums=('SKIP') + +prepare() { + cd ${srcdir}/${_dir} + git checkout upstream + _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') + + if [ -d ${_pkgname} ]; then + git subtree split -P ${_pkgname} --branch ${_pkgname} + git checkout ${_pkgname} + fi +} 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 + # 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 - # Create 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 2 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts. + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # Build project - cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # 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 \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |