[ros-ros] 01/01: Add rosmake ROS_ROOT patch

[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-ros.

commit 27018e68032ce80d250b3fe2b7b8deced9e2f955
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 17 00:02:09 2015 +0100

    Add rosmake ROS_ROOT patch
---
 .../0006-Add-default-ROS_ROOT-to-rosmake.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0006-Add-default-ROS_ROOT-to-rosmake.patch b/debian/patches/0006-Add-default-ROS_ROOT-to-rosmake.patch
new file mode 100644
index 0000000..fd78930
--- /dev/null
+++ b/debian/patches/0006-Add-default-ROS_ROOT-to-rosmake.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 17 Nov 2015 00:01:41 +0100
+Subject: Add default ROS_ROOT to rosmake
+
+---
+ tools/rosmake/src/rosmake/engine.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/rosmake/src/rosmake/engine.py b/tools/rosmake/src/rosmake/engine.py
+index 4d07047..5307101 100755
+--- a/tools/rosmake/src/rosmake/engine.py
++++ b/tools/rosmake/src/rosmake/engine.py
+@@ -381,6 +381,8 @@ class RosMakeAll:
+             with _popen_lock:
+                 num_cpus = parallel_build.num_cpus()
+                 local_env['ROS_PARALLEL_JOBS'] = "-j%d -l%d" % (num_cpus, num_cpus)
++        if 'ROS_ROOT' not in os.environ:
++                local_env['ROS_ROOT'] = '/usr/share/ros'
+         local_env['SVN_CMDLINE'] = "svn --non-interactive"
+         cmd = ["bash", "-c", "cd %s && %s "%(self.rospack.get_path(package), make_command()) ] #UNIXONLY
+         if argument:
diff --git a/debian/patches/series b/debian/patches/series
index 1b0b794..e97aa32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-env-roscreatepkg.patch
 0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
 0005-Fix-location-of-etc-ros-dir.patch
+0006-Add-default-ROS_ROOT-to-rosmake.patch

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