diff --git a/recipes-ros/catkin/catkin_0.6.19.bb b/recipes-ros/catkin/catkin_0.6.19.bb index e4a4ba2..ea33c02 100644 --- a/recipes-ros/catkin/catkin_0.6.19.bb +++ b/recipes-ros/catkin/catkin_0.6.19.bb @@ -1,6 +1,8 @@ require catkin.inc -SRC_URI += "file://environment.d-catkin.sh" +SRC_URI += "file://environment.d-catkin.sh \ + file://0001-strip-l-from-lpthread-library-to-fix-a-build-failure.patch \ +" DEPENDS_class-native += "catkin-runtime" diff --git a/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch b/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch index 0309579..9a3c8ec 100644 --- a/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch +++ b/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch @@ -1,4 +1,4 @@ -From e6179255b99264a51f8733f52d92ca579fbacb61 Mon Sep 17 00:00:00 2001 +From 5de0fe25ec27bca4c593e06cdc0c3dff3d553e06 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 15 Apr 2018 02:11:42 +0200 Subject: [PATCH] allow proper cross-compilation with catkin @@ -17,11 +17,12 @@ Some of the context lines in patches were ignored. This can lead to incorrectly Upstream-Status: Pending Signed-off-by: Lukas Bulwahn + --- cmake/all.cmake | 1 + - cmake/catkin_package.cmake | 8 ++++++++ - cmake/catkin_strip_root_path.cmake | 32 +++++++++++++++++++++++++++++ - cmake/templates/pkgConfig.cmake.in | 42 ++++++++++++++++++++++++++++++++++---- + cmake/catkin_package.cmake | 8 ++++++ + cmake/catkin_strip_root_path.cmake | 32 +++++++++++++++++++++++ + cmake/templates/pkgConfig.cmake.in | 42 +++++++++++++++++++++++++++--- 4 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 cmake/catkin_strip_root_path.cmake @@ -170,6 +171,3 @@ index d99b811..3af5c71 100644 break() endif() endforeach() --- -2.7.4 - diff --git a/recipes-ros/catkin/files/0001-strip-l-from-lpthread-library-to-fix-a-build-failure.patch b/recipes-ros/catkin/files/0001-strip-l-from-lpthread-library-to-fix-a-build-failure.patch new file mode 100644 index 0000000..be94421 --- /dev/null +++ b/recipes-ros/catkin/files/0001-strip-l-from-lpthread-library-to-fix-a-build-failure.patch @@ -0,0 +1,26 @@ +From e19e2085e1aa58456ed94c529536df387e0ab340 Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof +Date: Sat, 26 Jan 2019 07:36:24 +0100 +Subject: [PATCH] strip "-l" from "-lpthread" library, to fix a build failure + + on ros-ros-comm (#975) + +Upstream-Status: Backport from 0.17.15 [https://github.com/ros/catkin/commit/98f97ffcffbb7127d4a8aff0fcb26d1578557906] + +--- + cmake/templates/pkgConfig.cmake.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in +index 3af5c71..8bc8979 100644 +--- a/cmake/templates/pkgConfig.cmake.in ++++ b/cmake/templates/pkgConfig.cmake.in +@@ -135,6 +135,8 @@ foreach(library ${libraries}) + # keep build configuration keywords, target names and absolute libraries as-is + if("${library}" MATCHES "^(debug|optimized|general)$") + list(APPEND @PROJECT_NAME@_LIBRARIES ${library}) ++ elseif(${library} MATCHES "^-l") ++ list(APPEND @PROJECT_NAME@_LIBRARIES ${library}) + elseif(TARGET ${library}) + list(APPEND @PROJECT_NAME@_LIBRARIES ${library}) + elseif(IS_ABSOLUTE ${library} AND CMAKE_CROSSCOMPILING) diff --git a/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch b/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch index 56dd7a9..3d94a21 100644 --- a/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch +++ b/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch @@ -1,4 +1,4 @@ -From 7894487c0d749124c3b0d82fcebff2309a84024a Mon Sep 17 00:00:00 2001 +From 23972aa72e7364f6fd69cdd102274fc2a29fb395 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 31 May 2016 15:38:05 +0200 Subject: [PATCH] use python provided by environment instead of the generated