From df2f56cfa45242ea85154188ea6c38addc627303 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Fri, 30 May 2014 08:06:31 +0200
Subject: [PATCH] ros.bbclass: separating setup for faulty solibs from ros
 setup

---
 classes/catkin.bbclass                               | 2 +-
 classes/faulty-solibs.bbclass                        | 5 +++++
 classes/ros.bbclass                                  | 3 ---
 recipes-ros/console-bridge/console-bridge_0.2.4.bb   | 2 +-
 recipes-ros/octomap/octomap.inc                      | 2 +-
 recipes-ros/urdfdom-headers/urdfdom-headers_0.2.3.bb | 2 +-
 recipes-ros/urdfdom/urdfdom_0.2.10.bb                | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 classes/faulty-solibs.bbclass

diff --git a/classes/catkin.bbclass b/classes/catkin.bbclass
index f2e8a02..5286c4e 100644
--- a/classes/catkin.bbclass
+++ b/classes/catkin.bbclass
@@ -2,7 +2,7 @@
 # Copyright (c) 2013 Stefan Herbrechtsmeier, Bielefeld University
 # 
 
-inherit cmake distutils-base ros
+inherit cmake distutils-base ros faulty-solibs
 
 DEPENDS_prepend = "${@['catkin-native ', ''][d.getVar('BPN', True) == 'catkin']}"
 
diff --git a/classes/faulty-solibs.bbclass b/classes/faulty-solibs.bbclass
new file mode 100644
index 0000000..5ce0ad3
--- /dev/null
+++ b/classes/faulty-solibs.bbclass
@@ -0,0 +1,5 @@
+# Ideally, the software packages upstream should be fixed to provide dynamic
+# libraries with version number and symlinks without version number to them.
+# This class sets up bitbake to handle improper set up software packages. 
+FILES_SOLIBSDEV = ""
+FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
diff --git a/classes/ros.bbclass b/classes/ros.bbclass
index 3fb19ca..4e181ba 100644
--- a/classes/ros.bbclass
+++ b/classes/ros.bbclass
@@ -7,9 +7,6 @@ ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}"
 ROS_SPN ?= "${ROS_BPN}"
 ROS_SP = "${ROS_SPN}-${PV}"
 
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
-
 FILES_${PN} += "\
     ${prefix}/etc \
     ${datadir}/ros/config/${ROS_BPN}.config \
diff --git a/recipes-ros/console-bridge/console-bridge_0.2.4.bb b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
index 0053d4b..b6080e1 100644
--- a/recipes-ros/console-bridge/console-bridge_0.2.4.bb
+++ b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
@@ -18,4 +18,4 @@ SRC_URI[sha256sum] = "d4bdd0b6bce0c6fa9ff18b8926d4953161451bc49dd11497211eb1a62c
 
 S = "${WORKDIR}/${ROS_SP}"
 
-inherit cmake ros
+inherit cmake ros faulty-solibs
diff --git a/recipes-ros/octomap/octomap.inc b/recipes-ros/octomap/octomap.inc
index fe9fdc0..7141e12 100644
--- a/recipes-ros/octomap/octomap.inc
+++ b/recipes-ros/octomap/octomap.inc
@@ -8,6 +8,6 @@ EXTRA_OECMAKE += "\
   -DCMAKE_SKIP_RPATH=ON \
 "
 
-inherit cmake ros
+inherit cmake ros faulty-solibs
 
 ROS_SPN = "octomap"
diff --git a/recipes-ros/urdfdom-headers/urdfdom-headers_0.2.3.bb b/recipes-ros/urdfdom-headers/urdfdom-headers_0.2.3.bb
index 1d84670..54c99a2 100644
--- a/recipes-ros/urdfdom-headers/urdfdom-headers_0.2.3.bb
+++ b/recipes-ros/urdfdom-headers/urdfdom-headers_0.2.3.bb
@@ -10,4 +10,4 @@ SRC_URI[sha256sum] = "6b1f27b002c6d897b43ed57988133f40aac093a2a6e84d9bf08ed36a13
 
 S = "${WORKDIR}/${ROS_SP}"
 
-inherit cmake ros
+inherit cmake ros faulty-solibs
diff --git a/recipes-ros/urdfdom/urdfdom_0.2.10.bb b/recipes-ros/urdfdom/urdfdom_0.2.10.bb
index 5cd7590..37a5cd6 100644
--- a/recipes-ros/urdfdom/urdfdom_0.2.10.bb
+++ b/recipes-ros/urdfdom/urdfdom_0.2.10.bb
@@ -11,4 +11,4 @@ require urdfdom.inc
 
 S = "${WORKDIR}/${ROS_SP}"
 
-inherit ros cmake
+inherit cmake ros faulty-solibs