diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-04-19 17:02:33 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-04-21 12:32:33 +0000 |
| commit | 95fc94d91fca50d35f4458dce89cbd6a0248bf50 (patch) | |
| tree | 299d5d39d5de33c95c2017bac307a012cab3cd75 /classes/populate_b2qt_qt5_sdk.bbclass | |
| parent | 293bb2b4195281d7b4a56f16c77bdf16831334e4 (diff) | |
| download | meta-boot2qt-95fc94d91fca50d35f4458dce89cbd6a0248bf50.tar.gz | |
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 <risto.avila@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'classes/populate_b2qt_qt5_sdk.bbclass')
| -rw-r--r-- | classes/populate_b2qt_qt5_sdk.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 19 | ## | 19 | ## |
| 20 | ############################################################################## | 20 | ############################################################################## |
| 21 | 21 | ||
| 22 | inherit populate_b2qt_sdk populate_sdk_qt5_base | 22 | inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo |
| 23 | 23 | ||
| 24 | SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs" | 24 | SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs" |
| 25 | SDK_MKSPEC = "devices/linux-oe-generic-g++" | 25 | SDK_MKSPEC = "devices/linux-oe-generic-g++" |
| @@ -65,7 +65,7 @@ create_qtcreator_configure_script () { | |||
| 65 | # add qtcreator configuration script | 65 | # add qtcreator configuration script |
| 66 | install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} | 66 | install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} |
| 67 | sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh | 67 | sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh |
| 68 | sed -i -e '/^ABI=/c\ABI="${ARCH}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh | 68 | sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | create_qtcreator_configure_script_mingw32 () { | 71 | create_qtcreator_configure_script_mingw32 () { |