commit: 83065463cdd8afe86cb99bd81280ce64258def7f Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Aug 11 10:44:09 2021 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Aug 11 10:58:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83065463
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 <AT> gentoo.org> dev-ros/rviz/files/yamlcpp.patch | 14 ++++++++++++++ dev-ros/rviz/rviz-1.14.8.ebuild | 2 ++ dev-ros/rviz/rviz-9999.ebuild | 2 ++ 3 files changed, 18 insertions(+) diff --git a/dev-ros/rviz/files/yamlcpp.patch b/dev-ros/rviz/files/yamlcpp.patch new file mode 100644 index 00000000000..a0c9151d0cd --- /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 e25c75bee05..9440781bb3c 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 e25c75bee05..9440781bb3c 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 }
