From f41fc7701a5ee0541bb8ca0999744f852e371623 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 31 Jul 2020 11:51:07 +0300 Subject: [PATCH] Moving pkg-config address to export-host-variables.sh --- scripts/export-host-variables.sh | 4 +++- scripts/ffmpeg/build.sh | 2 +- scripts/libdav1d/build.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/export-host-variables.sh b/scripts/export-host-variables.sh index 1ce6575..751b9d5 100755 --- a/scripts/export-host-variables.sh +++ b/scripts/export-host-variables.sh @@ -33,5 +33,7 @@ export MAKE_EXECUTABLE=$(which make) export NINJA_EXECUTABLE=$(which ninja) # Meson is used for libdav1d building. Needs to be installed export MESON_EXECUTABLE=$(which meson) -# Nasm is used for libdav1d building. Needs to be installed +# Nasm is used for libdav1d and libx264 building. Needs to be installed export NASM_EXECUTABLE=$(which nasm) +# A utility to properly pick shared libraries by FFmpeg's configure script. Needs to be installed +export PKG_CONFIG_EXECUTABLE=$(which pkg-config) diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh index db8c7bc..eabf874 100755 --- a/scripts/ffmpeg/build.sh +++ b/scripts/ffmpeg/build.sh @@ -43,7 +43,7 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS" --extra-ldflags="$DEP_LD_FLAGS" \ --enable-shared \ --disable-static \ - --pkg-config=$(which pkg-config) \ + --pkg-config=${PKG_CONFIG_EXECUTABLE} \ ${EXTRA_BUILD_CONFIGURATION_FLAGS} \ $ADDITIONAL_COMPONENTS || exit 1 diff --git a/scripts/libdav1d/build.sh b/scripts/libdav1d/build.sh index 1c7ed29..ce60d61 100755 --- a/scripts/libdav1d/build.sh +++ b/scripts/libdav1d/build.sh @@ -10,7 +10,7 @@ c = '${FAM_CC}' ar = '${FAM_AR}' strip = '${FAM_STRIP}' nasm = '${NASM_EXECUTABLE}' -pkgconfig = '$(which pkg-config)' +pkgconfig = '${PKG_CONFIG_EXECUTABLE}' [properties] needs_exe_wrapper = true