Skip to content

Commit

Permalink
do not link against the system libexpat library, fixes #316
Browse files Browse the repository at this point in the history
  • Loading branch information
tanersener committed Jan 13, 2022
1 parent a3e235c commit b49218d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion scripts/apple/ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ x86-64-mac-catalyst)
esac

CONFIGURE_POSTFIX=""
HIGH_PRIORITY_LDFLAGS=""

# SET CONFIGURE OPTIONS
for library in {0..61}; do
Expand Down Expand Up @@ -294,6 +295,7 @@ for library in {0..61}; do
expat)
FFMPEG_CFLAGS+=" $(pkg-config --cflags expat 2>>"${BASEDIR}"/build.log)"
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)"
HIGH_PRIORITY_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)"
;;
libogg)
FFMPEG_CFLAGS+=" $(pkg-config --cflags ogg 2>>"${BASEDIR}"/build.log)"
Expand Down Expand Up @@ -449,7 +451,7 @@ COMMON_LDFLAGS=$(get_common_ldflags)
# UPDATE BUILD FLAGS
export CFLAGS="${ARCH_CFLAGS} ${APP_CFLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_CFLAGS} ${MIN_VERSION_CFLAGS}${FFMPEG_CFLAGS} ${COMMON_INCLUDES}"
export CXXFLAGS=$(get_cxxflags "${LIB_NAME}")
export LDFLAGS="${ARCH_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"
export LDFLAGS="${ARCH_LDFLAGS}${HIGH_PRIORITY_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"

echo -n -e "\n${LIB_NAME}: "

Expand Down

0 comments on commit b49218d

Please sign in to comment.