From 45de85773124890444ea73bef92cab85963e087e Mon Sep 17 00:00:00 2001 From: Andre Goddard Rosa Date: Fri, 25 May 2018 10:46:31 -0700 Subject: [PATCH] ament.bbclass: Fix wrong suffix 'x86_64-linux-gnu' in native python module shared library * Fix wrong suffix x86_64-linux-gnu in native python module shared library * Python native module shared library is cross-compiled for correct architecture but filename had an incorrect suffix 'x86_64-linux-gnu'. As per python_cmake_module, if PYTHON_SOABI environment variable is not defined, it'll query it from native's python sysconfig module. https://github.com/ros2/rosidl/blob/master/python_cmake_module/cmake/Modules/FindPythonExtra.cmake So adopt a solution similar to the one adopted below, where PYTHON_SOABI is set explicitly for our specific build. https://github.com/erlerobot/meta-ros2/blob/master/classes/ament.bbclass Signed-off-by: Martin Jansa --- classes/ament.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/ament.bbclass b/classes/ament.bbclass index 3819b05..2c9e80a 100644 --- a/classes/ament.bbclass +++ b/classes/ament.bbclass @@ -22,7 +22,7 @@ ROS_BPN ?= "${@d.getVar('BPN', True).replace('-', '_')}" S = "${WORKDIR}/git/${ROS_BPN}" -EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF" +EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=cpython-35m-${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}" export AMENT_PREFIX_PATH="${STAGING_DIR_HOST}${prefix};${STAGING_DIR_NATIVE}${prefix}" inherit cmake python3native