From 64aee78df824cebd69903f70c21514b44d8cadd3 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 24 Jul 2024 14:27:38 +0200 Subject: [PATCH] coin: Downgrade patchelf version on CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Downgrade patchelf version from 0.18.0 to 0.17.2 on MacOs, Linux and Windows. It looks like there is a problem with 0.18.0 version, when modyfing the Android libs. It causes an unresolved dependencies error when loading a changed library. Fixes: QTBUG-126861 Pick-to: 6.8 Change-Id: I5a95daae0a78aadede009535b2813483afcbc99d Reviewed-by: Jøger Hansegård --- coin/provisioning/common/unix/install-patchelf.sh | 6 +++--- coin/provisioning/common/windows/install-ffmpeg.ps1 | 8 ++++---- coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh | 2 +- coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh | 3 +-- coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh | 7 +++++++ 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100755 coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 6600795c..8e10e351 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -4,11 +4,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -patchelf_version="0.18.0" +patchelf_version="0.17.2" -url_cached="http://ci-files01-hki.ci.qt.io/input/patchelf/$patchelf_version.tar.gz" +url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz" url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz" -sha1="7eb974172de73b7b452ee376237ad78601603c45" +sha1="ddd46a2e2a16a308245c008721d877455b23bba8" target_source_dir="$HOME/patchelf-$patchelf_version" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 4f057fc9..f93b9412 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -183,16 +183,16 @@ function InstallAndroidArmv7 { Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm automake`"") Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"") - $patchelf_sha1 = "7EB974172DE73B7B452EE376237AD78601603C45" - $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.18.0.tar.gz" - $patchelf_download_location = "C:\Windows\Temp\0.18.0.tar.gz" + $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8" + $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz" + $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz" Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location Verify-Checksum $patchelf_download_location $patchelf_sha1 Extract-tar_gz $patchelf_download_location $unzip_location Remove $patchelf_download_location - Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.18.0 && ./bootstrap.sh && ./configure && make install`"") + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./bootstrap.sh && ./configure && make install`"") $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no" $command = $command.Replace("\", "/") diff --git a/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh index 0710f483..17a1b0c6 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh @@ -4,5 +4,5 @@ set -ex -brew install patchelf +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh index 0710f483..f60a7cdc 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh @@ -4,5 +4,4 @@ set -ex -brew install patchelf - +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh new file mode 100755 index 00000000..f60a7cdc --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 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 + +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"