Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Commit b49218d

Browse files
committed
do not link against the system libexpat library, fixes #316
1 parent a3e235c commit b49218d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

scripts/apple/ffmpeg.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ x86-64-mac-catalyst)
9999
esac
100100

101101
CONFIGURE_POSTFIX=""
102+
HIGH_PRIORITY_LDFLAGS=""
102103

103104
# SET CONFIGURE OPTIONS
104105
for library in {0..61}; do
@@ -294,6 +295,7 @@ for library in {0..61}; do
294295
expat)
295296
FFMPEG_CFLAGS+=" $(pkg-config --cflags expat 2>>"${BASEDIR}"/build.log)"
296297
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)"
298+
HIGH_PRIORITY_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)"
297299
;;
298300
libogg)
299301
FFMPEG_CFLAGS+=" $(pkg-config --cflags ogg 2>>"${BASEDIR}"/build.log)"
@@ -449,7 +451,7 @@ COMMON_LDFLAGS=$(get_common_ldflags)
449451
# UPDATE BUILD FLAGS
450452
export CFLAGS="${ARCH_CFLAGS} ${APP_CFLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_CFLAGS} ${MIN_VERSION_CFLAGS}${FFMPEG_CFLAGS} ${COMMON_INCLUDES}"
451453
export CXXFLAGS=$(get_cxxflags "${LIB_NAME}")
452-
export LDFLAGS="${ARCH_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"
454+
export LDFLAGS="${ARCH_LDFLAGS}${HIGH_PRIORITY_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}"
453455

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

0 commit comments

Comments
 (0)