Moving pkg-config address to export-host-variables.sh

pull/53/head
Javernaut 4 years ago
parent 7b237b4d5b
commit f41fc7701a
  1. 4
      scripts/export-host-variables.sh
  2. 2
      scripts/ffmpeg/build.sh
  3. 2
      scripts/libdav1d/build.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)

@ -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

@ -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

Loading…
Cancel
Save