From 6a53225497b432cd72635ab8f50bd61c920ced72 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 24 Sep 2013 07:10:11 +0200
Subject: [PATCH] roscpp: removing unneeded patch (resolves #125)
After the native packages are removed, the roscpp patch, which was
originally required for dynamic-reconfigure-native, is not needed
anymore.
---
...t-try-to-find-pthread-by-own-methods.patch | 42 -------------------
recipes-ros/ros-comm/roscpp_1.9.49.bb | 2 -
2 files changed, 44 deletions(-)
delete mode 100644 recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch
diff --git a/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch b/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch
deleted file mode 100644
index 29be494..0000000
--- a/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a392a5e614883c18bf64568b1ebffe95d7efcf15 Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Tue, 23 Jul 2013 15:18:07 +0200
-Subject: [PATCH] roscpp: do not try to find pthread by own methods
-
-This commit partially reverts c5dfa6305e883f76dc2aa52d27d2977e3d66ea2e
-in the ros/ros_comm repository.
----
- clients/roscpp/CMakeLists.txt | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index 4545073..872f3f6 100644
---- a/clients/roscpp/CMakeLists.txt
-+++ b/clients/roscpp/CMakeLists.txt
-@@ -34,22 +34,9 @@ add_service_files(
-
- generate_messages()
-
--set(PTHREAD_LIB "")
--find_package(Threads)
--if(CMAKE_THREAD_LIBS_INIT)
-- string(LENGTH ${CMAKE_THREAD_LIBS_INIT} _length)
-- if(_length GREATER 2)
-- string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 0 2 _prefix)
-- if(${_prefix} STREQUAL "-l")
-- math(EXPR _rest_len "${_length} - 2")
-- string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 2 ${_rest_len} PTHREAD_LIB)
-- endif()
-- endif()
--endif()
--
- catkin_package(
- INCLUDE_DIRS include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros
-- LIBRARIES roscpp ${PTHREAD_LIB}
-+ LIBRARIES roscpp
- CATKIN_DEPENDS cpp_common message_runtime rosconsole roscpp_serialization roscpp_traits rosgraph_msgs rostime std_msgs xmlrpcpp
- DEPENDS Boost
- )
---
-1.7.9.5
-
diff --git a/recipes-ros/ros-comm/roscpp_1.9.49.bb b/recipes-ros/ros-comm/roscpp_1.9.49.bb
index 31e0979..7126b22 100644
--- a/recipes-ros/ros-comm/roscpp_1.9.49.bb
+++ b/recipes-ros/ros-comm/roscpp_1.9.49.bb
@@ -11,8 +11,6 @@ DEPENDS = "cpp-common message-generation rosconsole roscpp-serialization \
require ros-comm.inc
-SRC_URI += "file://0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch;patchdir=../.."
-
ROS_PKG_SUBDIR = "clients"
CXXFLAGS_append = " -I${OECMAKE_BUILDPATH}/devel/include"
--
GitLab