catkin: revert commit beb46774

The patch added in the reverted commit was meant to fix the issue
https://github.com/bmwcarit/meta-ros/issues/291



In fact it enables CMake to look for libraries in a host system which
leads to errors when a path is tested for a library presence with the
help of CMake's find_library() command: e.g. a non-existing host
directory is tested for library presence and find_library() returns
successfully because the library exists in bitbake's sysroot; then the
directory is used by the linker, but the library doesn't exist in the
directory -> failure. In worse cases the host directory may actually exist
and contain the library, but of wrong architecture, format or
incompatible ABI making finding the root cause a difficult task.

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>

recipes-ros/catkin/catkin.inc

@@ -11,7 +11,6 @@ SRC_URI[sha256sum] = "81aff570966cb99d6305881cce6a645080a9778380e7fc2e67a33ac972
 
 SRC_URI += "\
     file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch \
-    file://0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch \
     file://0001-use-python-provided-by-environment-instead-of-the-ge.patch \
     "
 

recipes-ros/catkin/files/0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch

-From 25b1c65090ece840e29844253577d7ed6dc8251f Mon Sep 17 00:00:00 2001
-From: Kristof Robot <krirobo@gmail.com>
-Date: Thu, 21 Aug 2014 12:48:41 +0200
-Subject: [PATCH] catkin: including root path in library search
-
-Upstream-Status: Inappropriate [only for our setup]
-
-Signed-off-by: Kristof Robot <krirobo@gmail.com>
----
- cmake/templates/pkgConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
-index 91f6d65..f7bf2b2 100644
---- a/cmake/templates/pkgConfig.cmake.in
-+++ b/cmake/templates/pkgConfig.cmake.in
-@@ -125,7 +125,7 @@ foreach(library ${libraries})
-     foreach(path @PKG_CONFIG_LIB_PATHS@)
-       find_library(lib ${library}
-         PATHS ${path}
--        NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+        NO_DEFAULT_PATH)
-       if(lib)
-         set(lib_path ${path})
-         break()
--- 
-1.8.3.2
-