summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242020-07-06 15:35:42 +0200
committerbionade242020-07-06 15:35:42 +0200
commit2354f45e6f33e7afcf549e2728ac3d068e3c25d1 (patch)
tree48805b39a3a2e8517a986ca28cc50a6f3eb9c287
parentfb7e378619a82ce7dd4c0ce0c1ada0e9442a703f (diff)
downloadaur-2354f45e6f33e7afcf549e2728ac3d068e3c25d1.tar.gz
Set python version to 3
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e464982a00..192f729e2c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-octomap
pkgdesc = ROS - The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++.
pkgver = 1.9.0
- pkgrel = 4
+ pkgrel = 5
url = https://octomaphub.io
arch = any
license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index cc285ea3289..19fa91dec1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-melodic-octomap'
pkgver='1.9.0'
_pkgver_patch=1
arch=('any')
-pkgrel=4
+pkgrel=5
license=('BSD')
options=('staticlibs')
@@ -39,14 +39,14 @@ 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_EXECUTABLE=/usr/bin/python3 \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-DPYTHON_BASENAME=-python2.7 \