lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-03 15:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Fix 7z extract commands on RHEL 9.6

Browse Source 
More recent 7z requires additional switch due to multi hop links.

Change-Id: Ia023bf8d662d4c842acc97498e0b89cf2a2a167d
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit dd13fa7b41)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Simo Fält
2026-07-22 12:15:19 +03:00
parent f041bdc03d
commit fe897cd2bc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang-dyn.sh
+2 -2
View File
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
#Copyright (C) 2023 The Qt Company Ltd
#Copyright (C) 2026 The Qt Company Ltd
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-dyn.sh
"$BASEDIR/../common/unix/libclang-dyn.sh"
"$BASEDIR/../common/unix/libclang-dyn.sh" "-snld20"
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/05-libclang.sh
+1 -1
View File
@@ -5,4 +5,4 @@ set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang.sh
"$BASEDIR/../common/unix/libclang.sh"
"$BASEDIR/../common/unix/libclang.sh" "-snld20"
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/30-install_icu.sh
+2 -2
View File
@@ -23,7 +23,7 @@ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
targetFile=$(mktemp)
DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
sudo 7z x -y -o/usr/lib64 "$targetFile"
sudo 7z x -snld20 -y -o/usr/lib64 "$targetFile"
sudo rm "$targetFile"
echo "Installing custom ICU devel packages on RHEL"
@@ -32,7 +32,7 @@ tempDir=$(mktemp -d)
targetFile=$(mktemp)
DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
7z x -y -o"$tempDir" "$targetFile"
7z x -snld20 -y -o"$tempDir" "$targetFile"
sudo cp -a "$tempDir"/lib/* /usr/lib64
sudo cp -a "$tempDir"/* /usr/