From 89b4239a2a6419ea4f836b25c801432ffbd83447 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 15 Aug 2019 15:50:41 +0000 Subject: [PATCH] SQUASH ament.bbclass: fix PYTHON_SOABI value --- classes/ament.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/ament.bbclass b/classes/ament.bbclass index 54ed3e7..8aca161 100644 --- a/classes/ament.bbclass +++ b/classes/ament.bbclass @@ -1,9 +1,9 @@ -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" +PYTHON_SOABI_ARCH_x86 = "i386-${TARGET_OS}-gnu" +PYTHON_SOABI_ARCH_x86-64 = "x86_64-${TARGET_OS}-gnu" +PYTHON_SOABI_ARCH_arm = "${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}" +PYTHON_SOABI_ARCH_aarch64 = "${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}-gnu" -EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=${PYTHON_SOABI}" +EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=cpython-${@d.getVar('PYTHON_BASEVERSION').replace('.', '')}${PYTHON_ABI}-${PYTHON_SOABI_ARCH}" # XXX Without STAGING_DIR_HOST path included, rmw-implementation:do_configure() fails with: #