From 95e570de0e3d40f44629d177ba0a427ee5e783ce Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 20 Jul 2019 13:16:58 +0200 Subject: dev-ros/roscpp: upstream boost fix Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alexis Ballier --- dev-ros/roscpp/files/boost.patch | 26 ++++++++++++++++++++++++++ dev-ros/roscpp/roscpp-1.14.3-r1.ebuild | 31 +++++++++++++++++++++++++++++++ dev-ros/roscpp/roscpp-1.14.3.ebuild | 30 ------------------------------ 3 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 dev-ros/roscpp/files/boost.patch create mode 100644 dev-ros/roscpp/roscpp-1.14.3-r1.ebuild delete mode 100644 dev-ros/roscpp/roscpp-1.14.3.ebuild (limited to 'dev-ros') diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch new file mode 100644 index 000000000000..1d509a8ab6c7 --- /dev/null +++ b/dev-ros/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/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt +index a5d354ea6..8f462df2c 100644 +--- a/clients/roscpp/CMakeLists.txt ++++ b/clients/roscpp/CMakeLists.txt +@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h) + +-find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system) ++find_package(Boost REQUIRED COMPONENTS chrono filesystem system) + + include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + diff --git a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild new file mode 100644 index 000000000000..15e970883b2a --- /dev/null +++ b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild @@ -0,0 +1,31 @@ +# 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" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) +ROS_SUBDIR=clients/${PN} + +inherit ros-catkin + +DESCRIPTION="C++ implementation of ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rosconsole + dev-ros/roscpp_serialization + dev-ros/roscpp_traits + dev-ros/rostime + dev-ros/xmlrpcpp + dev-libs/boost:= + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/boost.patch" ) diff --git a/dev-ros/roscpp/roscpp-1.14.3.ebuild b/dev-ros/roscpp/roscpp-1.14.3.ebuild deleted file mode 100644 index 4d1d63e2e341..000000000000 --- a/dev-ros/roscpp/roscpp-1.14.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# 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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="C++ implementation of ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp_serialization - dev-ros/roscpp_traits - dev-ros/rostime - dev-ros/xmlrpcpp - dev-libs/boost:= - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND}" -- cgit v1.2.3-65-gdbad