diff options
| -rw-r--r-- | dev-ros/rosbash/files/catkin_prefix2.patch | 13 | ||||
| -rw-r--r-- | dev-ros/rosbash/rosbash-1.12.5.ebuild | 2 | ||||
| -rw-r--r-- | dev-ros/rosbash/rosbash-9999.ebuild | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/dev-ros/rosbash/files/catkin_prefix2.patch b/dev-ros/rosbash/files/catkin_prefix2.patch new file mode 100644 index 000000000000..f36a7c7d6f08 --- /dev/null +++ b/dev-ros/rosbash/files/catkin_prefix2.patch @@ -0,0 +1,13 @@ +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 diff --git a/dev-ros/rosbash/rosbash-1.12.5.ebuild b/dev-ros/rosbash/rosbash-1.12.5.ebuild index 300eb4bfbfa5..568560755492 100644 --- a/dev-ros/rosbash/rosbash-1.12.5.ebuild +++ b/dev-ros/rosbash/rosbash-1.12.5.ebuild @@ -17,4 +17,4 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/catkin_prefix.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix2.patch" ) diff --git a/dev-ros/rosbash/rosbash-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild index 300eb4bfbfa5..568560755492 100644 --- a/dev-ros/rosbash/rosbash-9999.ebuild +++ b/dev-ros/rosbash/rosbash-9999.ebuild @@ -17,4 +17,4 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/catkin_prefix.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix2.patch" ) |