diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index 5e492d2e..e7c8d8dd 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -31,6 +31,12 @@ if ! command -v patchelf; then exit 1 fi +# Get patchelf version +patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}') +if [[ "$patchelf_version" == "0.18.0" ]]; then + echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2 +fi + ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") stub_prefix="Qt6FFmpegStub-" diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 44ad9b88..ce15d239 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -5,6 +5,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2 +# See patchelf bugreport: https://github.com/NixOS/patchelf/issues/576. patchelf_version="0.17.2" url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz" diff --git a/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh index 414ed936..a2a91e16 100755 --- a/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh @@ -4,4 +4,4 @@ set -ex -brew install patchelf +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"