[ros] 01/01: Add patch for ROS_ROOT

[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 f21a72265f8bf33d64d32bc7989f21e2e9290407
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 1 08:38:38 2015 +0200

    Add patch for ROS_ROOT
---
 ...05-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch b/debian/patches/0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
new file mode 100644
index 0000000..89a5805
--- /dev/null
+++ b/debian/patches/0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 1 Sep 2015 08:37:52 +0200
+Subject: Sat ROS_ROOT for rosmake if it's not set
+
+---
+ core/mk/cmake.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/mk/cmake.mk b/core/mk/cmake.mk
+index e74b690..476fb4f 100644
+--- a/core/mk/cmake.mk
++++ b/core/mk/cmake.mk
+@@ -1,3 +1,7 @@
++ifeq ($(ROS_ROOT),)
++	export ROS_ROOT=/usr/share/ros
++endif
++
+ # set EXTRA_CMAKE_FLAGS in the including Makefile in order to add tweaks
+ CMAKE_FLAGS= -Wdev -DCMAKE_TOOLCHAIN_FILE=$(ROS_ROOT)/core/rosbuild/rostoolchain.cmake $(EXTRA_CMAKE_FLAGS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1d9f7f2..df4c6b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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