From 10da0ba4a342a93afdb4d57ef62a84c251991cdc Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 27 Sep 2024 10:58:07 +0200 Subject: [PATCH] Provisioning: Install libicu to /usr/local on Ubuntu 24.04 arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This amends 86a9bd1bb2c42d1ef45b72610a0a8d6dce307a5c . Pick-to: 6.8.0 6.8 Task-number: QTQAINFRA-6510 Task-number: QTBUG-129422 Change-Id: I7ffa5c23dda20fbe3a32e302adc20d2b8e41f52f Reviewed-by: Simo Fält --- .../qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh index f56ade93a16..b565e686c97 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh @@ -10,8 +10,8 @@ set -ex # This script will install ICU icuVersion="73.2" -icuLocationLib="/opt/icu/lib64" -icuLocationInclude="/opt/icu/include" +icuLocationLib="/usr/local/lib" +icuLocationInclude="/usr/local/include" sha1="82f3ed54fd7ea8ff469d9000164e4dc23378fc8c" baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" @@ -38,7 +38,7 @@ DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFil 7z x -y -o"$tempDir" "$targetFile" sudo cp -a "$tempDir"/lib/* "$icuLocationLib" -sudo cp -a "$tempDir"/* /opt/icu/ +sudo cp -a "$tempDir"/include/* "$icuLocationInclude" sudo rm "$targetFile" sudo rm -fr "$tempDir"