diff --git a/recipes-ros/catkin/catkin_0.5.58.bb b/recipes-ros/catkin/catkin_0.5.58.bb
index a2857607112c7d1f5cbc17640b0527ece8fe9b86..963e0383dd0644d96c657d21ec7a95219d80dc90 100644
--- a/recipes-ros/catkin/catkin_0.5.58.bb
+++ b/recipes-ros/catkin/catkin_0.5.58.bb
@@ -7,4 +7,13 @@ SRC_URI = "https://github.com/ros/catkin/archive/0.5.58.tar.gz"
 SRC_URI[md5sum] = "e4df85e60dc792af9324334547cc76aa"
 SRC_URI[sha256sum] = "dd99cc04eeaf16a13185dd0a2f576939fa997dfb16a40ba45068c4d2ebbcb44b"
 
+# DEPENDS = "python-setuptools"
+
+EXTRA_OECMAKE = "-DSETUPTOOLS_DEB_LAYOUT=OFF"
+
 inherit cmake pythonnative
+
+export BUILD_SYS
+export HOST_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR