diff options
Diffstat (limited to 'dev-ros/rosbash/files')
| -rw-r--r-- | dev-ros/rosbash/files/catkin_prefix.patch | 13 | ||||
| -rw-r--r-- | dev-ros/rosbash/files/catkin_prefix2.patch | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/dev-ros/rosbash/files/catkin_prefix.patch b/dev-ros/rosbash/files/catkin_prefix.patch new file mode 100644 index 000000000000..89877b005f9d --- /dev/null +++ b/dev-ros/rosbash/files/catkin_prefix.patch @@ -0,0 +1,13 @@ +Index: rosbash/scripts/rosrun +=================================================================== +--- rosbash.orig/scripts/rosrun ++++ rosbash/scripts/rosrun +@@ -47,7 +47,7 @@ case $2 in + ;; + esac + +-if [[ -n $CMAKE_PREFIX_PATH ]]; then ++if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then + _rosrun_IFS="$IFS" + IFS=$'\n' + catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec --share "$1" 2> /dev/null)) diff --git a/dev-ros/rosbash/files/catkin_prefix2.patch b/dev-ros/rosbash/files/catkin_prefix2.patch deleted file mode 100644 index f36a7c7d6f08..000000000000 --- a/dev-ros/rosbash/files/catkin_prefix2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ros-1.12.5/tools/rosbash/scripts/rosrun -=================================================================== ---- ros-1.12.5.orig/tools/rosbash/scripts/rosrun -+++ ros-1.12.5/tools/rosbash/scripts/rosrun -@@ -47,7 +47,7 @@ case $2 in - ;; - esac - --if [[ -n $CMAKE_PREFIX_PATH ]]; then -+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then - IFS=$'\n' - catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`) - unset IFS |