summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
2 files changed, 15 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d25ed3321121..46b31c3bcb07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,13 @@
pkgbase = ros-melodic-nodelet
pkgdesc = ROS - The nodelet package is designed to provide a way to run multiple algorithms in the same process with zero copy transport between algorithms.
pkgver = 1.9.16
- pkgrel = 2
+ pkgrel = 6
url = https://wiki.ros.org/nodelet
- arch = any
+ arch = i686
+ arch = x86_64
+ arch = aarch64
+ arch = armv7h
+ arch = armv6h
license = BSD
makedepends = cmake
makedepends = ros-build-tools
@@ -15,7 +19,7 @@ pkgbase = ros-melodic-nodelet
makedepends = ros-melodic-rosconsole
makedepends = ros-melodic-roscpp
makedepends = ros-melodic-pluginlib
- makedepends = boost
+ makedepends = boost1.69
makedepends = util-linux
depends = ros-melodic-bondcpp
depends = ros-melodic-std-msgs
@@ -24,7 +28,7 @@ pkgbase = ros-melodic-nodelet
depends = ros-melodic-message-runtime
depends = ros-melodic-rospy
depends = ros-melodic-pluginlib
- depends = boost
+ depends = boost1.69
depends = util-linux
source = ros-melodic-nodelet-1.9.16.tar.gz::https://github.com/ros/nodelet_core/archive/1.9.16.tar.gz
sha256sums = 609a85323a47aff2e5e53531a465ddc62ba3290ba8b359a12dd07253bbaa9e26
diff --git a/PKGBUILD b/PKGBUILD
index 3ab84476bd03..4b79c2af8598 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@ url='https://wiki.ros.org/nodelet'
pkgname='ros-melodic-nodelet'
pkgver='1.9.16'
-arch=('any')
-pkgrel=2
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
+pkgrel=6
license=('BSD')
ros_makedepends=(
@@ -24,7 +24,7 @@ makedepends=(
'cmake'
'ros-build-tools'
${ros_makedepends[@]}
- boost
+ boost1.69
util-linux
)
@@ -40,7 +40,7 @@ ros_depends=(
depends=(
${ros_depends[@]}
- boost
+ boost1.69
util-linux
)
@@ -66,10 +66,9 @@ build() {
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-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
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DBOOST_ROOT=/opt/boost1.69 \
+ -DBoost_NO_SYSTEM_PATHS=TRUE
make
}