summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD13
-rw-r--r--geographiclib.patch11
3 files changed, 23 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7326d2d8b20f..b2a9badb9736 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -51,7 +51,9 @@ pkgbase = ros-melodic-robot-localization
depends = eigen
depends = yaml-cpp
source = ros-melodic-robot-localization-2.6.9.tar.gz::https://github.com/cra-ros-pkg/robot_localization/archive/2.6.9.tar.gz
+ source = geographiclib.patch
sha256sums = 5652558fcd6ee4378a3f3d5a86c6358ccce481d01a8d0e24d2752bc06163cb66
+ sha256sums = 7efe1f393789f127bcc7e875f19153dbc1762a451c27db1edcb6ac82276c7d16
pkgname = ros-melodic-robot-localization
diff --git a/PKGBUILD b/PKGBUILD
index 17682716830a..c5d44409c008 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ url='https://wiki.ros.org/robot_localization'
pkgname='ros-melodic-robot-localization'
pkgver='2.6.9'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=3
license=('BSD')
ros_makedepends=(ros-melodic-tf2-ros
@@ -54,8 +54,15 @@ depends=(${ros_depends[@]}
yaml-cpp)
_dir="robot_localization-${pkgver}/"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/cra-ros-pkg/robot_localization/archive/${pkgver}.tar.gz")
-sha256sums=('5652558fcd6ee4378a3f3d5a86c6358ccce481d01a8d0e24d2752bc06163cb66')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/cra-ros-pkg/robot_localization/archive/${pkgver}.tar.gz"
+geographiclib.patch)
+sha256sums=('5652558fcd6ee4378a3f3d5a86c6358ccce481d01a8d0e24d2752bc06163cb66'
+ '7efe1f393789f127bcc7e875f19153dbc1762a451c27db1edcb6ac82276c7d16')
+
+prepare() {
+ cd ${srcdir}/${_dir}
+ patch -uN CMakeLists.txt ${srcdir}/geographiclib.patch || return 1
+}
build() {
# Use ROS environment variables
diff --git a/geographiclib.patch b/geographiclib.patch
new file mode 100644
index 000000000000..f0f730f1f305
--- /dev/null
+++ b/geographiclib.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2021-01-01 11:17:56.709028293 +0100
++++ CMakeLists.txt 2021-01-01 11:08:50.002805380 +0100
+@@ -32,7 +32,7 @@
+
+ # Geographiclib installs FindGeographicLib.cmake to this non-standard location
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/cmake/geographiclib/")
+-find_package(GeographicLib REQUIRED COMPONENTS STATIC)
++find_package(GeographicLib REQUIRED)
+
+ # Attempt to find Eigen using its own CMake module.
+ # If that fails, fall back to cmake_modules package.