mirror of
git://code.qt.io/qt/qt5.git
synced 2026-05-09 04:27:50 +08:00
Ubuntu: Build Patchelf from source
On Ubuntu hosts we are installing patchelf from apt, which delivers the newest version. As of writing that version is v0.18.0. This version specifically has issues with patching Android ARM binaries, which we do during FFmpeg provisioning. Using this version of patchelf blocks the option of using Ubuntu hosts for Android ARM builds. This patch makes us build v0.17.2 from source, which is what we do on other UNIX hosts. Pick-to: 6.11 Change-Id: I23d2114d2a7757ab0ce50cba7d207bc7813d64fb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
@@ -216,8 +216,6 @@ sudo dpkg --add-architecture i386
|
||||
installPackages+=(nfs-kernel-server)
|
||||
installPackages+=(net-tools)
|
||||
installPackages+=(bridge-utils)
|
||||
# Fix dependencies in shared ffmpeg libs
|
||||
installPackages+=(patchelf)
|
||||
# Keep zoneinfo up-to-date (COIN-1282)
|
||||
installPackages+=(tzdata)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user