diff options
| author | acxz | 2019-09-28 23:31:30 -0400 |
|---|---|---|
| committer | acxz | 2019-09-28 23:31:30 -0400 |
| commit | 0e9d295e4170748b4a3ff1ad13ffee4b79b43e56 (patch) | |
| tree | 3008d719a49a509a3f66bfa131b5f725d348bcf9 | |
| parent | 263c0287ca659e9bee3260fb4f277f731415f1fc (diff) | |
| download | aur-0e9d295e4170748b4a3ff1ad13ffee4b79b43e56.tar.gz | |
update to python 3
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 7 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-srdfdom pkgdesc = ROS - Parser for Semantic Robot Description Format (SRDF). pkgver = 0.5.1 - pkgrel = 2 + pkgrel = 3 url = https://wiki.ros.org/srdfdom arch = any license = BSD @@ -5,9 +5,8 @@ url='https://wiki.ros.org/srdfdom' pkgname='ros-melodic-srdfdom' pkgver='0.5.1' -_pkgver_patch=0 arch=('any') -pkgrel=2 +pkgrel=3 license=('BSD') ros_makedepends=(ros-melodic-urdfdom-py @@ -28,13 +27,6 @@ depends=(${ros_depends[@]} tinyxml urdfdom-headers) -# Git version (e.g. for debugging) -# _tag=release/melodic/srdfdom/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/srdfdom-release.git"#tag=${_tag}) -# sha256sums=('SKIP') - -# Tarball version (faster download) _dir="srdfdom-${pkgver}" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/srdfdom/archive/${pkgver}.tar.gz") sha256sums=('98d585667906da2485dfad67af3ee5df4caab9a5cd9faf5e794c06357a87a9cf') @@ -49,17 +41,17 @@ build() { cd ${srcdir}/build # Fix Python2/Python3 conflicts - /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} + /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 \ + -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 } |