summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD44
2 files changed, 33 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66117a032f05..d39da43d0447 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,22 @@
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
+ pkgdesc = Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost1.69::asio is included.
+ pkgver = 0.8.5
+ pkgrel = 4
url = http://wiki.ros.org/socketcan_interface?distro=melodic
- arch = any
+ arch = i686
+ arch = x86_64
+ arch = aarch64
+ arch = armv7h
+ arch = armv6h
license = LGPL3
makedepends = cmake
makedepends = ros-build-tools
- depends = boost
+ makedepends = ros-melodic-catkin
+ depends = boost1.69
depends = linux-headers
depends = ros-melodic-class-loader
- source = ros_canopen-0.8.0.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.0.tar.gz
- sha256sums = b822d2a70eb273076d7dfde847bd52593d6577503207beb98a43b96855f64250
+ source = ros-melodic-socketcan-interface-0.8.5.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/0.8.5.tar.gz
+ sha256sums = 3ef1aefdaadfc3548a9b3ea419709f858c1bb9bfdf85cf76ccd8bbcde5c34d9f
pkgname = ros-melodic-socketcan-interface
diff --git a/PKGBUILD b/PKGBUILD
index ca1afd32a5f2..f853d1d1f5f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,49 @@
# Contributor: michaelchou <michaeljchou at the hotmail domain which is .com>
pkgname=ros-melodic-socketcan-interface
-_pkgname=socketcan_interface
-pkgdesc='Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost::asio is included.'
-url="http://wiki.ros.org/${_pkgname}?distro=melodic"
+pkgdesc='Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost1.69::asio is included.'
+url="http://wiki.ros.org/socketcan_interface?distro=melodic"
-pkgver=0.8.0
-pkgrel=1
-arch=('any')
+pkgver='0.8.5'
+pkgrel=4
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
license=('LGPL3')
-_parent_pkgname="ros_canopen"
-_dir="ros_canopen-${pkgver}"
-source=("${_parent_pkgname}-${pkgver}.tar.gz::https://github.com/ros-industrial/ros_canopen/archive/${pkgver}.tar.gz")
-sha256sums=('b822d2a70eb273076d7dfde847bd52593d6577503207beb98a43b96855f64250')
-
-ros_makedepends=(
+ros_makedepends=( ros-melodic-catkin
)
makedepends=(cmake ros-build-tools ${ros_makedepends[@]})
ros_depends=(
ros-melodic-class-loader
)
-depends=(boost linux-headers ${ros_depends[@]})
+depends=(boost1.69 linux-headers ${ros_depends[@]})
+
+_dir="ros_canopen-${pkgver}/socketcan_interface"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-industrial/ros_canopen/archive/${pkgver}.tar.gz")
+sha256sums=('3ef1aefdaadfc3548a9b3ea419709f858c1bb9bfdf85cf76ccd8bbcde5c34d9f')
build() {
# Use ROS environment variables
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} \
+ cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
+ -DCATKIN_ENABLE_TESTING=0 \
-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 \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DBOOST_ROOT=/opt/boost1.69 \
+ -DBoost_NO_SYSTEM_PATHS=TRUE
make
}