summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242019-02-01 21:59:11 +0000
committerbionade242019-02-01 21:59:11 +0000
commit98557b6d7802c8c99dc21413ac4de6d4b86b6743 (patch)
tree47e3be40a30423369833646767445fa68b930eeb
parentfca61c3659f939c11dc6e9ebba51c27a51fc1bca (diff)
downloadaur-98557b6d7802c8c99dc21413ac4de6d4b86b6743.tar.gz
Changed python linking to python3
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD13
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e756520ba7b4..6e475f2ca77f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-joy
pkgdesc = ROS - ROS driver for a generic Linux joystick.
pkgver = 1.12.0
- pkgrel = 1
+ pkgrel = 2
url = http://www.ros.org/wiki/joy
arch = any
license = BSD
@@ -16,6 +16,7 @@ pkgbase = ros-melodic-joy
depends = ros-melodic-roscpp
depends = ros-melodic-sensor-msgs
depends = linuxconsole
+ depends = python-empy
source = ros-melodic-joy-1.12.0-0.tar.gz::https://github.com/ros-gbp/joystick_drivers-release/archive/release/melodic/joy/1.12.0-0.tar.gz
sha256sums = b2942c8164aec9fee0c21d0cb7f8c1e77c3e5e555b10489024e3795de272c600
diff --git a/PKGBUILD b/PKGBUILD
index a0dde718d72f..efa4a70b9529 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-melodic-joy'
pkgver='1.12.0'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-melodic-diagnostic-updater
@@ -22,7 +22,8 @@ ros_depends=(ros-melodic-diagnostic-updater
ros-melodic-roscpp
ros-melodic-sensor-msgs)
depends=(${ros_depends[@]}
- linuxconsole)
+ linuxconsole
+ python-empy)
# Git version (e.g. for debugging)
# _tag=release/melodic/joy/${pkgver}-${_pkgver_patch}
@@ -52,10 +53,10 @@ build() {
-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
}