aboutsummaryrefslogtreecommitdiff
path: root/package/x264
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-08-31 09:04:09 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-08-31 09:04:09 +0200
commitd29b105318b985752e4ab56984689f8c1f21a155 (patch)
treeeeb113671b0e5c71234d8f8f8d21fc3c462b394b /package/x264
parentfe15d50310afed4c0f59826244b9e61e509d4a6f (diff)
downloadbuildroot-d29b105318b985752e4ab56984689f8c1f21a155.tar.gz
buildroot-d29b105318b985752e4ab56984689f8c1f21a155.tar.bz2
x264: unbreak x86 build after version bump
Fixes: http://autobuild.buildroot.net/results/3ec/3ec54f722d6008fc422540d3a5462b306d16e84c/ The recent x264 version bump broke the configure step on x86/x86-64 as x264 ends up using gas instead of yasm as assembler. The reason for this is the recent upstream commit to optionally use nasm instead of yasm if AS= is passed: commit b568a256b9bc6c500d7b1ffe4b9c3311ee5ff337 Author: Henrik Gramner <henrik@gramner.com> Date: Sat May 23 19:44:16 2015 +0200 x86: Experimental nasm support Enables the use of nasm as an alternative to yasm. Note that nasm cannot assemble x264 with PIC enabled since it currently doesn't support [symbol-$$] addressing which is used extensively by x264's PIC code. This includes all 64-bit Windows and 64-bit OS X builds, even non-shared. For the above reason nasm is currently intentionally not auto-detected, instead the assembler must be explicitly specified using "AS=nasm ./configure". Also drop -O2 from ASFLAGS since it's simply ignored anyway. But as we pass AS=$(TARGET_AS) it ends up using gas instead. Fix it by explicitly passing AS=yasm instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/x264')
-rw-r--r--package/x264/x264.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index d24cf2064b..7e7e597965 100644
--- a/package/x264/x264.mk
+++ b/package/x264/x264.mk
@@ -13,7 +13,9 @@ X264_INSTALL_STAGING = YES
X264_CONF_OPTS = --disable-avs
ifeq ($(BR2_i386)$(BR2_x86_64),y)
+# yasm needed for assembly files
X264_DEPENDENCIES += host-yasm
+X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm"
else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
# We need to pass gcc as AS, because the ARM assembly files have to be
# preprocessed