From 758ac7896ff268605e88548ac0bec89414f43f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Wed, 23 Oct 2024 10:38:37 +0200 Subject: [PATCH] coin, macOS, FFmpeg: Fix install-ffmpeg-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Script would previously unconditionally run ln even if target file sometimes exists in precompiled OpenSSL library. Pick-to: 6.8 Change-Id: I90c4ad7c6cbf9207c2c82114936b478a9ba4ae54 Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index fdd80336..c9c87c49 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -57,8 +57,8 @@ build_ffmpeg_android() { libs_prefix="_arm64-v8a" fi - ln -s "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" - ln -s "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" + ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" + ln -Ffs "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" api_version=24