diff options
author | ZHOU Yue | 2018-09-27 17:33:21 +0800 |
---|---|---|
committer | ZHOU Yue | 2018-09-27 17:33:21 +0800 |
commit | 23625cfcb50d4fab428d6f75bc0f3affe6cde1fc (patch) | |
tree | 9f83595477f2970745b461b2ffd55306d3408b1d | |
parent | e01efdd944b5121f152155cb2bd107857bcce934 (diff) | |
download | aur-23625cfcb50d4fab428d6f75bc0f3affe6cde1fc.tar.gz |
change to use python3.7
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 11 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-socketcan-interface pkgdesc = Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost::asio is included. pkgver = 0.8.0 - pkgrel = 1 + pkgrel = 2 url = http://wiki.ros.org/socketcan_interface?distro=melodic arch = any license = LGPL3 @@ -7,7 +7,7 @@ pkgdesc='Generic CAN interface description with helpers for filtering and driver url="http://wiki.ros.org/${_pkgname}?distro=melodic" pkgver=0.8.0 -pkgrel=1 +pkgrel=2 arch=('any') license=('LGPL3') @@ -30,23 +30,23 @@ build() { source /usr/share/ros-build-tools/clear-ros-env.sh [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash -# # Fix Python2/Python3 conflicts -# /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} - # Create build directory - [ -d ${srcdir}/build ] || mkdir -p ${srcdir}/build + [ -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}/${_pkgname} \ -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 + -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 } |