Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x264: fix cross-build #1342

Merged
merged 1 commit into from
Sep 19, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/x264/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ test_relver '>=' 151041 && set_clangver
# x264 contains BMI instructions even when built on an older CPU
BMI_EXPECTED=1

# we don't want x264 to have a (circular) runtime dependency on ffmpeg
CONFIGURE_OPTS="
--enable-shared
--disable-swscale
--disable-lavf
"
CONFIGURE_OPTS[i386]+="
--enable-pic
Expand All @@ -57,9 +60,6 @@ CFLAGS+=" -O3"
LDFLAGS[i386]+=" -lssp_ns"
LDFLAGS[amd64]+=" -Wl,-R$PREFIX/lib/amd64"

# we don't want x264 to have a (circular) runtime dependency on ffmpeg
PKG_CONFIG_PATH=()

init
download_source $PROG $PROG-stable $VER
patch_source
Expand Down
Loading