summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-01-05 10:38:01 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-01-06 14:58:04 +0100
commitf79742edb1fd7c2964f317dcffb754e03d0cb540 (patch)
treeacd01e547473fb217b5212ab6a7109fa3d3a4412
parent27c87ecec66b609d727947fa60dcbc5f00c81698 (diff)
downloadqt5-f79742edb1fd7c2964f317dcffb754e03d0cb540.tar.gz
Build Linux packages against legacy OpenGL libs
Do not link against the GLVND OpenGL libs (libOpenGL.so.0), because those might not be available on target systems. In order to do that, we set OpenGL_GL_PREFERENCE to LEGACY. Pick-to: 6.0 Fixes: QTBUG-89754 Change-Id: I28e8c62b137f17cf6692b84f438a8ae60ebe0e91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 35558dbb..0a99c56e 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -119,7 +119,7 @@ Configurations:
Template: 'qtci-linux-CentOS-8.1-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache']
- Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+ Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-