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 69804138359 for ; Fri, 7 Aug 2020 13:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DCF4E0844; Fri, 7 Aug 2020 13:16:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 148F0E0844 for ; Fri, 7 Aug 2020 13:16:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9B0E634F46E for ; Fri, 7 Aug 2020 13:16:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EB03309 for ; Fri, 7 Aug 2020 13:16:35 +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: <1596806177.fe92a7ebd0267e053d01643dcf00655e87f9393b.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/libdir.patch dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild dev-ros/pluginlib/pluginlib-1.13.0.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: fe92a7ebd0267e053d01643dcf00655e87f9393b X-VCS-Branch: master Date: Fri, 7 Aug 2020 13:16:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12a5e3cb-6742-4e21-bdeb-5ae4fbca0ee7 X-Archives-Hash: 1234a887296b9bb55fadc1efd5b255c1 commit: fe92a7ebd0267e053d01643dcf00655e87f9393b Author: Alexis Ballier gentoo org> AuthorDate: Fri Aug 7 10:38:42 2020 +0000 Commit: Alexis Ballier gentoo 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 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 ClassLoader: + 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 }