summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-06-24 09:35:14 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-06-24 12:08:07 +0200
commit929ddf4de92a38c90abe1dcf68c572e366a86b19 (patch)
tree9c265e9d35b62998b4e8f31196385ccd7e462ffc
parent45943c849e776492d882412b3def56a15ae2e3b8 (diff)
downloadbuildroot-929ddf4de92a38c90abe1dcf68c572e366a86b19.tar.gz
buildroot-929ddf4de92a38c90abe1dcf68c572e366a86b19.zip
package/x264: needs host-nasm instead of host-yasm
Upstream switched to nasm >= 2.13 http://git.videolan.org/?p=x264.git;a=commitdiff;h=d2b5f4873e2147452a723b61b14f030b2ee760a5#patch2 Fixes http://autobuild.buildroot.net/results/3f5/3f5759a1fd6aaa0394229cdfce278752d4a01ddc/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/x264/x264.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index 69ec4ccea3..a5a967b3f7 100644
--- a/package/x264/x264.mk
+++ b/package/x264/x264.mk
@@ -13,9 +13,9 @@ X264_INSTALL_STAGING = YES
X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
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"
+# nasm needed for assembly files
+X264_DEPENDENCIES += host-nasm
+X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/nasm"
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
OpenPOWER on IntegriCloud