| 1 |
commit: fe92a7ebd0267e053d01643dcf00655e87f9393b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 7 10:38:42 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 7 13:16:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe92a7eb |
| 7 |
|
| 8 |
dev-ros/pluginlib: add more search pathes |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/pluginlib/files/libdir.patch | 19 +++++++++++++++++++ |
| 14 |
...inlib-1.13.0.ebuild => pluginlib-1.13.0-r1.ebuild} | 5 +---- |
| 15 |
dev-ros/pluginlib/pluginlib-9999.ebuild | 5 +---- |
| 16 |
3 files changed, 21 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ros/pluginlib/files/libdir.patch b/dev-ros/pluginlib/files/libdir.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..5152705f019 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-ros/pluginlib/files/libdir.patch |
| 23 |
@@ -0,0 +1,19 @@ |
| 24 |
+Add more search pathes for potential libdirs |
| 25 |
+ |
| 26 |
+Index: pluginlib/include/pluginlib/class_loader_imp.hpp |
| 27 |
+=================================================================== |
| 28 |
+--- pluginlib.orig/include/pluginlib/class_loader_imp.hpp |
| 29 |
++++ pluginlib/include/pluginlib/class_loader_imp.hpp |
| 30 |
+@@ -323,6 +323,12 @@ std::vector<std::string> ClassLoader<T>: |
| 31 |
+ boost::filesystem::path bin("bin"); |
| 32 |
+ lib_paths.push_back((path / bin).string()); |
| 33 |
+ #endif |
| 34 |
++ boost::filesystem::path lib64("lib64"); |
| 35 |
++ lib_paths.push_back((path / lib64).string()); |
| 36 |
++ boost::filesystem::path lib32("lib32"); |
| 37 |
++ lib_paths.push_back((path / lib32).string()); |
| 38 |
++ boost::filesystem::path libx32("libx32"); |
| 39 |
++ lib_paths.push_back((path / libx32).string()); |
| 40 |
+ boost::filesystem::path lib("lib"); |
| 41 |
+ lib_paths.push_back((path / lib).string()); |
| 42 |
+ } |
| 43 |
|
| 44 |
diff --git a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild |
| 45 |
similarity index 81% |
| 46 |
rename from dev-ros/pluginlib/pluginlib-1.13.0.ebuild |
| 47 |
rename to dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild |
| 48 |
index 6589477b3a3..3386003b331 100644 |
| 49 |
--- a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild |
| 50 |
+++ b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild |
| 51 |
@@ -23,15 +23,12 @@ RDEPEND=" |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
test? ( dev-cpp/gtest )" |
| 55 |
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) |
| 56 |
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" ) |
| 57 |
|
| 58 |
src_test() { |
| 59 |
cmake_build tests |
| 60 |
|
| 61 |
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 62 |
- if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then |
| 63 |
- ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die |
| 64 |
- fi |
| 65 |
export CATKIN_PREFIX_PATH=devel/ |
| 66 |
ros-catkin_src_test |
| 67 |
} |
| 68 |
|
| 69 |
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 70 |
index 6589477b3a3..3386003b331 100644 |
| 71 |
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 72 |
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 73 |
@@ -23,15 +23,12 @@ RDEPEND=" |
| 74 |
" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
test? ( dev-cpp/gtest )" |
| 77 |
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) |
| 78 |
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" ) |
| 79 |
|
| 80 |
src_test() { |
| 81 |
cmake_build tests |
| 82 |
|
| 83 |
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 84 |
- if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then |
| 85 |
- ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die |
| 86 |
- fi |
| 87 |
export CATKIN_PREFIX_PATH=devel/ |
| 88 |
ros-catkin_src_test |
| 89 |
} |
Archives