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

coin: Downgrade patchelf version on CI

Browse Source 
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
Change-Id: I5a95daae0a78aadede009535b2813483afcbc99d
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 64aee78df8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Bartlomiej Moskal
2024-07-24 14:27:38 +02:00
committed by Qt Cherry-pick Bot
parent a11202a0b6
commit 74cdd355d6
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/unix/install-patchelf.sh
View File

@@ -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"

8
coin/provisioning/common/windows/install-ffmpeg.ps1
View File

@@ -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("\", "/")

2
coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh
View File

@@ -4,5 +4,5 @@
set -ex
brew install patchelf
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"

3
coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh
View File

@@ -4,5 +4,4 @@
set -ex
brew install patchelf
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"

7
coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh Executable file
View File

@@ -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"