[gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/

[Alexis Ballier]

commit:     fe92a7ebd0267e053d01643dcf00655e87f9393b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 10:38:42 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 13:16:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe92a7eb

dev-ros/pluginlib: add more search pathes

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/pluginlib/files/libdir.patch                  | 19 +++++++++++++++++++
 ...inlib-1.13.0.ebuild => pluginlib-1.13.0-r1.ebuild} |  5 +----
 dev-ros/pluginlib/pluginlib-9999.ebuild               |  5 +----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/dev-ros/pluginlib/files/libdir.patch 
b/dev-ros/pluginlib/files/libdir.patch
new file mode 100644
index 00000000000..5152705f019
--- /dev/null
+++ b/dev-ros/pluginlib/files/libdir.patch
@@ -0,0 +1,19 @@
+Add more search pathes for potential libdirs
+
+Index: pluginlib/include/pluginlib/class_loader_imp.hpp
+===================================================================
+--- pluginlib.orig/include/pluginlib/class_loader_imp.hpp
++++ pluginlib/include/pluginlib/class_loader_imp.hpp
+@@ -323,6 +323,12 @@ std::vector<std::string> ClassLoader<T>:
+       boost::filesystem::path bin("bin");
+       lib_paths.push_back((path / bin).string());
+ #endif
++      boost::filesystem::path lib64("lib64");
++      lib_paths.push_back((path / lib64).string());
++      boost::filesystem::path lib32("lib32");
++      lib_paths.push_back((path / lib32).string());
++      boost::filesystem::path libx32("libx32");
++      lib_paths.push_back((path / libx32).string());
+       boost::filesystem::path lib("lib");
+       lib_paths.push_back((path / lib).string());
+     }

diff --git a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild 
b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
similarity index 81%
rename from dev-ros/pluginlib/pluginlib-1.13.0.ebuild
rename to dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
index 6589477b3a3..3386003b331 100644
--- a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
@@ -23,15 +23,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
 
 src_test() {
        cmake_build tests
 
        export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-       if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then
-               ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die
-       fi
        export CATKIN_PREFIX_PATH=devel/
        ros-catkin_src_test
 }

diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild 
b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 6589477b3a3..3386003b331 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -23,15 +23,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
 
 src_test() {
        cmake_build tests
 
        export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-       if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then
-               ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die
-       fi
        export CATKIN_PREFIX_PATH=devel/
        ros-catkin_src_test
 }