diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:58:39 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:58:39 +0200 |
commit | 68611342dd74083926068784effd9ae24a4baa96 (patch) | |
tree | 8b32c4df760849783515b9025a048b070d38ca7a | |
parent | ce0e7f37c81dcdb972838c121d18d365975123a2 (diff) | |
download | aur-68611342dd74083926068784effd9ae24a4baa96.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 103 |
2 files changed, 63 insertions, 48 deletions
@@ -8,13 +8,13 @@ pkgbase = ros-melodic-roslisp makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-std-srvs depends = ros-melodic-rosgraph-msgs - depends = ros-melodic-rospack + depends = ros-melodic-std-srvs depends = ros-melodic-roslang + depends = ros-melodic-rospack depends = sbcl - source = ros-melodic-roslisp-1.9.21-0.tar.gz::https://github.com/ros-gbp/roslisp-release/archive/release/melodic/roslisp/1.9.21-0.tar.gz - sha256sums = f75e7abb1e744d5a6703b25356722dbe413f4d8626805aedf61a80ef95036da7 + source = ros-melodic-roslisp::git+https://github.com/ros-gbp/roslisp-release.git + sha256sums = SKIP pkgname = ros-melodic-roslisp @@ -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 - Lisp client library for ROS, the Robot Operating System." url='http://ros.org/wiki/roslisp' @@ -10,54 +10,69 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-catkin +) -ros_depends=(ros-melodic-std-srvs - ros-melodic-rosgraph-msgs - ros-melodic-rospack - ros-melodic-roslang) -depends=(${ros_depends[@]} - sbcl) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/roslisp/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/roslisp-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-rosgraph-msgs + ros-melodic-std-srvs + ros-melodic-roslang + ros-melodic-rospack +) -# Tarball version (faster download) -_dir="roslisp-release-release-melodic-roslisp-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/roslisp-release/archive/release/melodic/roslisp/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('f75e7abb1e744d5a6703b25356722dbe413f4d8626805aedf61a80ef95036da7') +depends=( + ${ros_depends[@]} + sbcl +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/roslisp-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 - - # Create 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} - - # 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 + # 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 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 \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |