From 3917d45ac14931b913b2396cbe7b9b36a2d08330 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 24 Jan 2023 12:16:03 +0000 Subject: [PATCH] Add additional target for Red Hat 9.0 x86_64 We need to keep Red Hat 8.4 or 8.6 for packaging target and for Android targets at the moment. If we switch to use RHEL 9 it will cause problems with GLIBC with older distros. Let's add additional target for Red Hat 9 without packaging flag to catch the issues Task-number: QTQAINFRA-5111 Change-Id: I3056a820cfdf61fc307cbd07f561afe31ad689f7 Reviewed-by: Ville Voutilainen Reviewed-by: Jani Heikkinen (cherry picked from commit 3831a11120824a125999ed2a8f1e02f57cbf8cbb) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index eed7b64d..3f9a8bc0 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -168,6 +168,17 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] +- + Id: 'rhel-9.0' + Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + ] - Id: 'ios-universal' Template: 'qtci-macos-12-x86_64-105'