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

Add missing comment line to describe patchelf usage

Browse Source 
Patchelf is added to fix dependencies in shared ffmpeg libs
(amends 83adc86c53)

Pick-to: 6.8
Task-number: QTBUG-120990
Change-Id: Ia9359c1a77e82203d53e3d2940885a0c254024c9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 7a5b6bdeaa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6722895711)
This commit is contained in:
Tero Heikkinen
2026-02-13 16:04:44 +02:00
committed by Qt Cherry-pick Bot
parent 888f401dda
commit 1a28d5735a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
View File

@@ -236,9 +236,8 @@ installPackages+=(cifs-utils)
installPackages+=(uml-utilities)
# To save iptables rules
installPackages+=(iptables-persistent)
# Fix dependencies in shared ffmpeg libs
installPackages+=(patchelf)
# For Firebird in RTA
installPackages+=(libtommath-dev)
# For tst_license.pl with all the machines generating SBOM

2
coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh
View File

@@ -245,7 +245,7 @@ installPackages+=(keyutils)
installPackages+=(cifs-utils)
# VxWorks QEMU network setup (tunctl)
installPackages+=(uml-utilities)
# Fix dependencies in shared ffmpeg libs
installPackages+=(patchelf)
echo "Running update for apt"