lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-10 04:58:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin, macOS, FFmpeg: Fix incorrect popd in install-ffmpeg-android.sh

Browse Source 
popd was placed incorrectly and caused the script to be unable to find
the fix_ffmpeg_dependencies.sh file.

Change-Id: I7922a698e90d1b3899ecc7b2240a260ea706707f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 8f47837a59)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Nils Petter Skålerud
2024-10-23 12:03:58 +02:00
committed by Qt Cherry-pick Bot
parent 9de96e816b
commit 6b453e2221
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/install-ffmpeg-android.sh
View File

@@ -95,6 +95,8 @@ build_ffmpeg_android() {
sudo make install -j4 sudo make install -j4
popd
rm -f "${openssl_libs}/libcrypto.so" rm -f "${openssl_libs}/libcrypto.so"
rm -f "${openssl_libs}/libssl.so" rm -f "${openssl_libs}/libssl.so"
@@ -102,8 +104,6 @@ build_ffmpeg_android() {
fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
fi fi
popd
} }
if [ "$os" == "android-x86" ]; then if [ "$os" == "android-x86" ]; then