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

Fix shellcheck complaints about provisioning scripts

Browse Source 
Also adds executable attributes to shell scripts that were missing it.

Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Tony Sarajärvi
2023-03-29 12:04:54 +00:00
parent ddef5cc5f2
commit 620666bce4
263 changed files with 457 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,8 @@ build_ffmpeg_android() {
sysroot=${toolchain}/sysroot
cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++
cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
ld=${toolchain_bin}/ld
ar=${toolchain_bin}/llvm-ar
ranlib=${toolchain_bin}/llvm-ranlib
nm=${toolchain_bin}/llvm-nm
strip=${toolchain_bin}/llvm-strip
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
@@ -76,7 +73,8 @@ build_ffmpeg_android() {
sudo mkdir -p "$build_dir"
pushd "$build_dir"
sudo $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$target_dir"
# shellcheck disable=SC2086
sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$target_dir"
sudo make install -j4
popd