[ros] 02/03: Remove rosbuild patch (applied upstream)

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros.

commit 9a80a16c74c57567224ba8f3ba1be5c4cbda3e9c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Sep 21 10:44:35 2015 +0200

    Remove rosbuild patch (applied upstream)
---
 ...kin-694-by-modifying-rosbuild-to-strip-le.patch | 39 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/0004-Fix-ros-catkin-694-by-modifying-rosbuild-to-strip-le.patch b/debian/patches/0004-Fix-ros-catkin-694-by-modifying-rosbuild-to-strip-le.patch
deleted file mode 100644
index 2371b41..0000000
--- a/debian/patches/0004-Fix-ros-catkin-694-by-modifying-rosbuild-to-strip-le.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Brian Gerkey <gerkey at osrfoundation.org>
-Date: Mon, 13 Jul 2015 18:46:58 -0700
-Subject: Fix ros/catkin#694 by modifying rosbuild to strip leading -l: from
- libraries.
-
----
- core/rosbuild/core/rosbuild/public.cmake | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/rosbuild/core/rosbuild/public.cmake b/core/rosbuild/core/rosbuild/public.cmake
-index 1ea805a..6d56183 100644
---- a/core/rosbuild/core/rosbuild/public.cmake
-+++ b/core/rosbuild/core/rosbuild/public.cmake
-@@ -258,6 +258,25 @@ macro(rosbuild_init)
-       list(REVERSE ${_prefix}_LIBRARIES)
-     endif()
- 
-+    # Strip the leading ':' from any library that was given to us as
-+    # ':/path/to/lib'.  Those kinds of libraries generally come from
-+    # catkin-generated .pc files that are parsed by rospack via pkg-config.
-+    # Newer versions of ld (and gold) don't accept the '-l:/path/to/lib'
-+    # syntax.  They've long accepted the '/path/to/lib' syntax, so it
-+    # should be safe to just strip the ':' here.  We could remove it at
-+    # the source, from the .pc file, but the lib argument needs to start
-+    # with '-l' to ensure proper ordering of libs in the return from
-+    # pkg-config.
-+    # https://github.com/ros/catkin/issues/694
-+    if(${_prefix}_LIBRARIES)
-+      set(_${_prefix}_LIBRARIES ${${_prefix}_LIBRARIES})
-+      set(${_prefix}_LIBRARIES "")
-+      foreach(_lib ${_${_prefix}_LIBRARIES})
-+        string(REGEX REPLACE "^:/" "/" _lib_nocolon ${_lib})
-+        list(APPEND ${_prefix}_LIBRARIES ${_lib_nocolon})
-+      endforeach(_lib)
-+    endif()
-+
-     # Also throw in the libs that we want to link everything against (only
-     # use case for this so far is -lgcov when building with code coverage
-     # support).
diff --git a/debian/patches/series b/debian/patches/series
index df4c6b2..859388e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
 0003-Fix-env-roscreatepkg.patch
-0004-Fix-ros-catkin-694-by-modifying-rosbuild-to-strip-le.patch
 0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros.git