diff --git a/ffmpeg-android-maker.sh b/ffmpeg-android-maker.sh index ad7f947..c72a42a 100755 --- a/ffmpeg-android-maker.sh +++ b/ffmpeg-android-maker.sh @@ -112,7 +112,7 @@ do cd ${!COMPONENT_SOURCES_DIR_VARIABLE} # and executing the component-specific build script - ${SCRIPTS_DIR}/${COMPONENT}/build.sh + source ${SCRIPTS_DIR}/${COMPONENT}/build.sh # Returning to the root directory. Just in case. cd ${BASE_DIR} diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh index f051a3a..87e4e4d 100755 --- a/scripts/ffmpeg/build.sh +++ b/scripts/ffmpeg/build.sh @@ -34,7 +34,6 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS" --enable-shared \ --disable-static \ --pkg-config=$(which pkg-config) \ - --pkg-config-flags="--static" \ ${EXTRA_BUILD_CONFIGURATION_FLAGS} \ $ADDITIONAL_COMPONENTS diff --git a/scripts/libopus/build.sh b/scripts/libopus/build.sh index adc1b3a..4d4a353 100755 --- a/scripts/libopus/build.sh +++ b/scripts/libopus/build.sh @@ -19,6 +19,8 @@ RANLIB=${FAM_RANLIB} \ AR=${FAM_AR} +export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lm" + ${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} -j${HOST_NPROC} ${MAKE_EXECUTABLE} install