From 485ada3a533bf055c9356c0b3224deeffb5b42f5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 17 Jun 2024 15:38:43 +0200 Subject: [PATCH] coin: test gcc-14 for qtbase only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6203 Change-Id: Ib0d710825b631e3dfbd0c7fdbd4c7cdf280af6a9 Reviewed-by: Simo Fält Reviewed-by: Liang Qi Reviewed-by: Tero Heikkinen --- .../qtbase-new-compiler-testing.yaml | 12 ++++++++++++ .../qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ 2 files changed, 14 insertions(+) diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index 19361ff9..09e0d54a 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -12,3 +12,15 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] +# Test gcc-14 on Ubuntu 24.04 ARM64 Wayland +- + Id: 'ubuntu-24.04-arm64-gcc14' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['UseConfigure', 'DoNotRunTests'] + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' + Environment variables: [ + 'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14', + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + ] diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index d5964432..dfe7aa9b 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -115,6 +115,8 @@ installPackages+=(locales-all) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) #installPackages+=(g++-multilib) installPackages+=(g++-multilib-powerpc-linux-gnu) +installPackages+=(gcc-14) +installPackages+=(g++-14) # python3 development package installPackages+=(python3-dev)