[ros-pluginlib] 01/01: Add patch for triplet search path

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-pluginlib.

commit 6ee2a9aaea68d55e6ea637759cee78c8b74dd37d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 4 08:59:03 2015 +0100

    Add patch for triplet search path
---
 ...multiarch-triplet-as-optional-search-path.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0002-Add-multiarch-triplet-as-optional-search-path.patch b/debian/patches/0002-Add-multiarch-triplet-as-optional-search-path.patch
new file mode 100644
index 0000000..0e6b7ec
--- /dev/null
+++ b/debian/patches/0002-Add-multiarch-triplet-as-optional-search-path.patch
@@ -0,0 +1,24 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 4 Dec 2015 08:57:30 +0100
+Subject: Add multiarch triplet as optional search path
+
+CMAKE_LIBRARY_ARCHITECTURE needs to be defined by the project using
+pluginlib. Useful for libraries using pluginlib.
+---
+ include/pluginlib/class_loader_imp.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/pluginlib/class_loader_imp.h b/include/pluginlib/class_loader_imp.h
+index 38f1db5..ac19be9 100644
+--- a/include/pluginlib/class_loader_imp.h
++++ b/include/pluginlib/class_loader_imp.h
+@@ -248,6 +248,9 @@ namespace pluginlib
+     std::vector<std::string> all_paths_without_extension = getCatkinLibraryPaths();
+     all_paths_without_extension.push_back(getROSBuildLibraryPath(exporting_package_name));
+     all_paths_without_extension.push_back("/usr/lib/" + exporting_package_name);
++#ifdef CMAKE_LIBRARY_ARCHITECTURE
++    all_paths_without_extension.push_back("/usr/lib/" CMAKE_LIBRARY_ARCHITECTURE);
++#endif
+     bool debug_library_suffix = (class_loader::systemLibrarySuffix().compare(0, 1, "d") == 0);
+     std::string non_debug_suffix;
+     if(debug_library_suffix) {
diff --git a/debian/patches/series b/debian/patches/series
index 139908b..a3e2623 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-default-plugin-path.patch
+0002-Add-multiarch-triplet-as-optional-search-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-pluginlib.git