From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5639B1396D9 for ; Fri, 10 Nov 2017 08:51:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FD6CE0ECD; Fri, 10 Nov 2017 08:51:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53375E0ECD for ; Fri, 10 Nov 2017 08:51:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CFD633C4EE for ; Fri, 10 Nov 2017 08:51:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E4BA98AA for ; Fri, 10 Nov 2017 08:51:24 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1510303878.68550f71c97eec4fea2c31e41075e4ed838b86d9.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/pluginlib/files/catkin_prefix_path.patch dev-ros/pluginlib/files/gentoo2.patch dev-ros/pluginlib/pluginlib-1.11.1.ebuild dev-ros/pluginlib/pluginlib-9999.ebuild X-VCS-Directories: dev-ros/pluginlib/ dev-ros/pluginlib/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 68550f71c97eec4fea2c31e41075e4ed838b86d9 X-VCS-Branch: master Date: Fri, 10 Nov 2017 08:51:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e8e2d722-1a84-4946-925b-baa6688296cd X-Archives-Hash: eef3e0e65a26d20e27a6c3930159cdc8 commit: 68550f71c97eec4fea2c31e41075e4ed838b86d9 Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 10 08:50:11 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 10 08:51:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68550f71 dev-ros/pluginlib: Fix runtime issues using CMAKE_PREFIX_PATH Package-Manager: Portage-2.3.13, Repoman-2.3.4 dev-ros/pluginlib/files/catkin_prefix_path.patch | 15 +++++++++++ dev-ros/pluginlib/files/gentoo2.patch | 32 ------------------------ dev-ros/pluginlib/pluginlib-1.11.1.ebuild | 2 +- dev-ros/pluginlib/pluginlib-9999.ebuild | 2 +- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dev-ros/pluginlib/files/catkin_prefix_path.patch b/dev-ros/pluginlib/files/catkin_prefix_path.patch new file mode 100644 index 00000000000..f5a19ec6d42 --- /dev/null +++ b/dev-ros/pluginlib/files/catkin_prefix_path.patch @@ -0,0 +1,15 @@ +Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH. + +Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h +=================================================================== +--- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h ++++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h +@@ -66,7 +66,7 @@ namespace + std::vector catkinFindLib() + { + std::vector lib_paths; +- const char * env = std::getenv("CMAKE_PREFIX_PATH"); ++ const char * env = std::getenv("CATKIN_PREFIX_PATH"); + if (env) { + std::string env_catkin_prefix_paths(env); + std::vector catkin_prefix_paths; diff --git a/dev-ros/pluginlib/files/gentoo2.patch b/dev-ros/pluginlib/files/gentoo2.patch deleted file mode 100644 index 60fbd7fee41..00000000000 --- a/dev-ros/pluginlib/files/gentoo2.patch +++ /dev/null @@ -1,32 +0,0 @@ -Find package.xml in ros_packages/package_name too as we moved it here. - -Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h -=================================================================== ---- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h -+++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h -@@ -510,12 +510,17 @@ ClassLoader::getPackageFromPluginXMLF - std::string package_name; - boost::filesystem::path p(plugin_xml_file_path); - boost::filesystem::path parent = p.parent_path(); -+ boost::filesystem::path basename = p.filename(); - - // Figure out exactly which package the passed XML file is exported by. - while (true) { - if (boost::filesystem::exists(parent / "package.xml")) { - std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string(); - return extractPackageNameFromPackageXML(package_file_path); -+ } else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml")) -+ { -+ std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string(); -+ return(extractPackageNameFromPackageXML(package_file_path)); - } else if (boost::filesystem::exists(parent / "manifest.xml")) { - #if BOOST_FILESYSTEM_VERSION >= 3 - std::string package = parent.filename().string(); -@@ -532,6 +537,7 @@ ClassLoader::getPackageFromPluginXMLF - } - - // Recursive case - hop one folder up -+ basename = parent.filename(); - parent = parent.parent_path().string(); - - // Base case - reached root and cannot find what we're looking for diff --git a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild index 1e00a91c58c..730a3b5305d 100644 --- a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild +++ b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild @@ -24,4 +24,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" -PATCHES=( "${FILESDIR}/gentoo2.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" ) diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild index 1e00a91c58c..730a3b5305d 100644 --- a/dev-ros/pluginlib/pluginlib-9999.ebuild +++ b/dev-ros/pluginlib/pluginlib-9999.ebuild @@ -24,4 +24,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" -PATCHES=( "${FILESDIR}/gentoo2.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )