diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 36 |
2 files changed, 8 insertions, 34 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Dec 19 18:44:15 UTC 2017 +# Thu Dec 21 22:29:46 UTC 2017 pkgbase = ros-ardent-ros2topic pkgdesc = ROS - The topic command for ROS 2 command line tools. pkgver = 0.4.0 @@ -9,9 +9,9 @@ pkgbase = ros-ardent-ros2topic license = Apache License 2.0 makedepends = cmake makedepends = ros-build-tools - depends = ros-ardent-ros2cli depends = ros-ardent-ros2msg - depends = python3-yaml + depends = ros-ardent-ros2cli + depends = python-yaml source = ros-ardent-ros2topic-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ros2cli-release/archive/release/ardent/ros2topic/0.4.0-0.tar.gz sha256sums = 4fff7d8f90c8bbb4b04b03d4073e1280786dc46504a3dda13198e0eb419d665a @@ -14,10 +14,10 @@ ros_makedepends=() makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-ardent-ros2cli - ros-ardent-ros2msg) +ros_depends=(ros-ardent-ros2msg + ros-ardent-ros2cli) depends=(${ros_depends[@]} - python3-yaml) + python-yaml) # Git version (e.g. for debugging) # _tag=release/ardent/ros2topic/${pkgver}-${_pkgver_patch} @@ -30,33 +30,7 @@ _dir="ros2cli-release-release-ardent-ros2topic-${pkgver}-${_pkgver_patch}" source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ros2cli-release/archive/release/ardent/ros2topic/${pkgver}-${_pkgver_patch}.tar.gz") sha256sums=('4fff7d8f90c8bbb4b04b03d4073e1280786dc46504a3dda13198e0eb419d665a') -build() { - # Use ROS environment variables - source /usr/share/ros-build-tools/clear-ros-env.sh - [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/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 3 "${srcdir}/${_dir}" - - # Build project - cmake "${srcdir}/${_dir}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \ - -DPYTHON_BASENAME=.cpython-35m \ - -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DCATKIN_ENABLE_TESTING=OFF - make -} - package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/${_dir}" + python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1 } |