diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-25 14:15:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-11-14 21:07:33 +0000 |
| commit | 74b7265f64d9aa6754c4fa35be39b8fb645a666e (patch) | |
| tree | 07d320494b4debaeb27dc8b64214f7528a05dfea | |
| parent | 4c162a22219c60b7873edbd125a26431fd45851a (diff) | |
Add libatomic to RHEL 8.8
Needed for qtwebengine 6.7
Pick-to: 6.5
Fixes: QTBUG-119109
Change-Id: I38d78731578dcb4ce5a8755d116e1326e6d6ffa4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 23ab8c94b07370d8f8b2ffe8cb6956bc84c8c076)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-install-gcc-toolset.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-install-gcc-toolset.sh index 032a841d..dfed7489 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-install-gcc-toolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-install-gcc-toolset.sh @@ -5,6 +5,6 @@ set -ex -sudo yum -y install gcc-toolset-10 +sudo yum -y install gcc-toolset-10 gcc-toolset-10-libatomic-devel echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index ca646b7a..ef503897 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -78,6 +78,7 @@ installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) +installPackages+=(libatomic) # For Android builds installPackages+=(java-11-openjdk-devel) # For receiving shasum |