p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ament.bbclass: use ARCH overrides to set PYTHON_SOABI instead of mapping based on MACHINE 

* to fix parsing the recipes with qemuarm

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
This commit is contained in:
Martin Jansa 2019-06-28 16:48:29 +00:00 committed by Herb Kuta
parent 97686cfbcf
commit 488b4baac3
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/ament.bbclass
View File

@ -1,19 +1,10 @@
PYTHON_SOABI_x86 = "i386-${TARGET_OS}-gnu"
PYTHON_SOABI_x86-64 = "x86_64-${TARGET_OS}-gnu"
PYTHON_SOABI_arm = "${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}"
PYTHON_SOABI_aarch64 = "${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}-gnu"
def ament__get_python_soabi(d): EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=${PYTHON_SOABI}"
machine = d.getVar('MACHINE', True)
pysoabi_prefix = 'cpython-' + d.getVar('PYTHON_BASEVERSION', True).replace('.', '') + d.getVar('PYTHON_ABI', True)
machine_pysoabi_map = {
'qemux86': (d.getVar('QB_SYSTEM_NAME_x86', True) or '').rsplit('-')[-1] + '-${TARGET_OS}-gnu',
'qemux86-64': (d.getVar('QB_SYSTEM_NAME_x86-64', True) or '').rsplit('-')[-1] + '-${TARGET_OS}-gnu',
'qemuarm64': '${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}-gnu',
'raspberrypi3': '${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}',
}
try:
return pysoabi_prefix + '-' + machine_pysoabi_map[machine]
except KeyError:
bb.fatal('Unknown MACHINE name: ' + machine + '; can not determine the PYTHON_SOABI value.')
EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=${@ament__get_python_soabi(d)}"
# XXX Without STAGING_DIR_HOST path included, rmw-implementation:do_configure() fails with: # XXX Without STAGING_DIR_HOST path included, rmw-implementation:do_configure() fails with:
# #
# "Could not find ROS middleware implementation 'NOTFOUND'" # "Could not find ROS middleware implementation 'NOTFOUND'"