From a02a5e5fb37fe10cc3368285c0d4021958501cbd Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Mon, 25 Mar 2019 16:14:11 -0700 Subject: [PATCH] DRAFT cv-bridge-2.1.0.inc: Fixup dependencies --- includes-ros1/vision-opencv/cv-bridge-2.1.0.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc index 361fbae..a4b4074 100644 --- a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc +++ b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc @@ -1,5 +1,12 @@ # Copyright (c) 2019 LG Electronics, Inc. +ROS_BUILD_DEPENDS_remove = "python-numpy" +ROS_BUILD_DEPENDS_remove = "python3-numpy" + +ROS_BUILDTOOL_DEPENDS += " \ + ${PYTHON_PN}-numpy-native \ +" + # This option disables python2 support because we can't support both python2 # and python3 since OE upstream has disabled python2 bindings in Boost. EXTRA_OECMAKE =+ "${@'-DANDROID=ON' if d.getVar('PYTHON_PN') != 'python3' else ''}"