2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4315e56bb1df..33e03f845923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,13 @@
 pkgbase = ros-melodic-costmap-2d
 	pkgdesc = ROS - This package provides an implementation of a 2D costmap.
 	pkgver = 1.16.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://wiki.ros.org/costmap_2d
-	arch = any
+	arch = i686
+	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = armv6h
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 2655328a15a0..f1165788fbc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@ url='https://wiki.ros.org/costmap_2d'
 
 pkgname='ros-melodic-costmap-2d'
 pkgver='1.16.2'
-arch=('any')
-pkgrel=4
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
+pkgrel=5
 license=('BSD')
 
 ros_makedepends=(
@@ -68,9 +68,6 @@ 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=-python3.7m \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }