Explicitly use boost 1.69

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d49aaecade6e..fcae4323a156 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-actionlib
 	pkgdesc = ROS - The actionlib stack provides a standardized interface for interfacing with preemptable tasks.
 	pkgver = 1.12.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.ros.org/actionlib
 	arch = i686
 	arch = x86_64
@@ -28,7 +28,7 @@ pkgbase = ros-melodic-actionlib
 	depends = ros-melodic-rospy
 	depends = ros-melodic-roslib
 	depends = python-wxpython
-	depends = boost
+	depends = boost1.69
 	source = ros-melodic-actionlib-1.12.1.tar.gz::https://github.com/ros/actionlib/archive/1.12.1.tar.gz
 	sha256sums = b98852a6cdd6947200a1d985d4041c0d9c28fe0d789284edc561f85486a792d0
 
diff --git a/PKGBUILD b/PKGBUILD
index 638feb763cf1..c8cf4143a86f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ url='https://wiki.ros.org/actionlib'
 pkgname='ros-melodic-actionlib'
 pkgver='1.12.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
@@ -40,7 +40,7 @@ ros_depends=(
 depends=(
 	${ros_depends[@]}
 	python-wxpython
-	boost
+	boost1.69
 )
 
 _dir="actionlib-${pkgver}"
@@ -65,7 +65,8 @@ build() {
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
 		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DSETUPTOOLS_DEB_LAYOUT=OFF
+		-DSETUPTOOLS_DEB_LAYOUT=OFF \
+                -DBOOST_ROOT=/opt/boost1.69
 	make
 }