summaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-05-27 07:57:39 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-05-27 08:06:16 +0200
commit4d99fb00cc49171facd3cf9fe379428a8c8fed13 (patch)
treed70caa32e185548a5937e773c1a4da22f57eeadc /coin/platform_configs
parent68134db435b670abb9f785f54e58593e90e1f484 (diff)
Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7
This amends 68134db4. Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/qtbase.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 3727c1b7..287ac3e1 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -13,7 +13,7 @@ Configurations:
Target arch: 'armv7'
Compiler: 'GCC'
Features: ['DisableTests']
- Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.0-rc2/bin"]
+ Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.2/bin"]
Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'