diff options
| -rw-r--r-- | dev-ros/pluginlib/files/libdir.patch | 19 | ||||
| -rw-r--r-- | dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild (renamed from dev-ros/pluginlib/pluginlib-1.13.0.ebuild) | 5 | ||||
| -rw-r--r-- | 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 000000000000..5152705f0196 --- /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 index 6589477b3a39..3386003b331c 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 6589477b3a39..3386003b331c 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 } |