diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
| commit | 64b3189079aa6c10a0204880a58df53b36b9f36a (patch) | |
| tree | 7508f174756528dfe5ad3a359ef24ac3c2baf3f7 /eclass/ros-catkin.eclass | |
| parent | 5d6f128da92287fc0b2643d810ecd96f81ac3aa2 (diff) | |
| parent | fbc240f551b32a009511d34ac5c3fd7c15ef82b9 (diff) | |
| download | gentoo-brillo-m7-dev.tar.gz | |
Merge https://github.com/gentoo/gentoo.gitbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
Diffstat (limited to 'eclass/ros-catkin.eclass')
| -rw-r--r-- | eclass/ros-catkin.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 41405b339c..412ff66e01 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -63,7 +63,8 @@ RDEPEND=" DEPEND="${RDEPEND}" if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then - RDEPEND="${RDEPEND} dev-lang/python-exec:2" + RDEPEND="${RDEPEND} dev-lang/python-exec:2 ${PYTHON_DEPS}" + DEPEND="${DEPEND} ${PYTHON_DEPS}" fi # @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES @@ -124,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/${ROS_SUBDIR} else SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" - S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR} + S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} fi HOMEPAGE="http://wiki.ros.org/${PN}" @@ -201,8 +202,8 @@ ros-catkin_src_compile() { # Decorator around cmake-utils_src_test to ensure tests are built before running them. ros-catkin_src_test_internal() { cd "${BUILD_DIR}" || die - if nonfatal emake tests -n &> /dev/null ; then - emake VERBOSE=1 tests + if nonfatal cmake-utils_src_make tests -n &> /dev/null ; then + cmake-utils_src_make tests fi cmake-utils_src_test "${@}" } |