From 95fc94d91fca50d35f4458dce89cbd6a0248bf50 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 19 Apr 2016 17:02:33 +0300 Subject: Make ABI selection more robust in configure-qtcreator.sh Map current TARGET_ARCH to the ABI used by qtcreator. Currently mapping was done by kernel-arch.bbclass and it worked by accident, but it's now broken in jethro. Change-Id: I15c5b60a1bc1dd560685fedac9b61048a1e89266 Reviewed-by: Risto Avila Reviewed-by: Teemu Holappa --- classes/populate_b2qt_qt5_sdk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/populate_b2qt_qt5_sdk.bbclass') diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index d6b2b10..ae88685 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass @@ -19,7 +19,7 @@ ## ############################################################################## -inherit populate_b2qt_sdk populate_sdk_qt5_base +inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs" SDK_MKSPEC = "devices/linux-oe-generic-g++" @@ -65,7 +65,7 @@ create_qtcreator_configure_script () { # add qtcreator configuration script install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh - sed -i -e '/^ABI=/c\ABI="${ARCH}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh + sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh } create_qtcreator_configure_script_mingw32 () { -- cgit v1.2.3-54-g00ecf