diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2021-08-11 12:44:09 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2021-08-11 12:58:36 +0200 |
| commit | 83065463cdd8afe86cb99bd81280ce64258def7f (patch) | |
| tree | cd8bd15c947bcea97f50006c9b90ecb38d7d6e5e /dev-ros/rviz | |
| parent | dev-ros/robot_pose_ekf: fix tests (diff) | |
| download | gentoo-83065463cdd8afe86cb99bd81280ce64258def7f.tar.gz gentoo-83065463cdd8afe86cb99bd81280ce64258def7f.tar.bz2 gentoo-83065463cdd8afe86cb99bd81280ce64258def7f.zip | |
dev-ros/rviz: fix yaml-cpp detection
Closes: https://bugs.gentoo.org/show_bug.cgi?id=804678
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros/rviz')
| -rw-r--r-- | dev-ros/rviz/files/yamlcpp.patch | 14 | ||||
| -rw-r--r-- | dev-ros/rviz/rviz-1.14.8.ebuild | 2 | ||||
| -rw-r--r-- | dev-ros/rviz/rviz-9999.ebuild | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/dev-ros/rviz/files/yamlcpp.patch b/dev-ros/rviz/files/yamlcpp.patch new file mode 100644 index 000000000000..a0c9151d0cd0 --- /dev/null +++ b/dev-ros/rviz/files/yamlcpp.patch @@ -0,0 +1,14 @@ +Index: rviz-1.14.8/src/rviz/CMakeLists.txt +=================================================================== +--- rviz-1.14.8.orig/src/rviz/CMakeLists.txt ++++ rviz-1.14.8/src/rviz/CMakeLists.txt +@@ -1,4 +1,8 @@ +-find_package(yaml-cpp REQUIRED) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(YAML_CPP yaml-cpp) ++if(NOT YAML_CPP_FOUND) ++ find_package(yaml-cpp REQUIRED) ++endif() + + include_directories(${YAML_CPP_INCLUDE_DIR}) + diff --git a/dev-ros/rviz/rviz-1.14.8.ebuild b/dev-ros/rviz/rviz-1.14.8.ebuild index e25c75bee058..9440781bb3cd 100644 --- a/dev-ros/rviz/rviz-1.14.8.ebuild +++ b/dev-ros/rviz/rviz-1.14.8.ebuild @@ -69,6 +69,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}/yamlcpp.patch" ) + src_test() { virtx ros-catkin_src_test } diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild index e25c75bee058..9440781bb3cd 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-9999.ebuild @@ -69,6 +69,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}/yamlcpp.patch" ) + src_test() { virtx ros-catkin_src_test } |