From cfc8fa175f286a57d8055de9681f6070e19bd365 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 20 Jul 2019 13:20:49 +0200 Subject: dev-ros/test_roscpp: upstream boost fix Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alexis Ballier --- dev-ros/test_roscpp/files/boost.patch | 26 +++++++++++++++++++ dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild | 32 ++++++++++++++++++++++++ dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild | 31 ----------------------- 3 files changed, 58 insertions(+), 31 deletions(-) create mode 100644 dev-ros/test_roscpp/files/boost.patch create mode 100644 dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild delete mode 100644 dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild (limited to 'dev-ros') diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch new file mode 100644 index 000000000000..41bac154d6ce --- /dev/null +++ b/dev-ros/test_roscpp/files/boost.patch @@ -0,0 +1,26 @@ +commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70 +Author: Maarten de Vries +Date: Thu Jan 31 00:58:29 2019 +0100 + + Remove signals from find_package(Boost COMPONENTS ...) (#1580) + + The packages use signals2, not signals. Only boost libraries with + compiled code should be passed to find_package(Boost COMPONENTS ...), + and the signals2 library has always been header only. + + Boost 1.69 has removed the deprecated signals library, so the otherwise + useless but harmless `signals` component now breaks the build. + +diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt +index 519767362..01c3d6672 100644 +--- a/test/test_roscpp/CMakeLists.txt ++++ b/test/test_roscpp/CMakeLists.txt +@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS + ) + + if(CATKIN_ENABLE_TESTING) +- find_package(Boost REQUIRED COMPONENTS signals filesystem system) ++ find_package(Boost REQUIRED COMPONENTS filesystem system) + + include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild new file mode 100644 index 000000000000..8e988cf0c461 --- /dev/null +++ b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for roscpp" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/roscpp + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:=[threads] + test? ( + dev-cpp/gtest + ) +" +REQUIRED_USE="test? ( ros_messages_cxx )" +PATCHES=( "${FILESDIR}/boost.patch" ) diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild deleted file mode 100644 index 74f15fb4247b..000000000000 --- a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Unit tests for roscpp" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/roscpp - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-libs/boost:=[threads] - test? ( - dev-cpp/gtest - ) -" -REQUIRED_USE="test? ( ros_messages_cxx )" -- cgit v1.2.3-65-gdbad