Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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>
Bernd Kuhls 8 years ago
parent
45943c849e
commit
929ddf4de9
1 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 3 3
      package/x264/x264.mk

+ 3 - 3
package/x264/x264.mk
View File 

@@ -13,9 +13,9 @@ X264_INSTALL_STAGING = YES
 
 X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
 
 X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
 
 
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 
 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)
 
 else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
 
 # We need to pass gcc as AS, because the ARM assembly files have to be
 
 # We need to pass gcc as AS, because the ARM assembly files have to be
 
 # preprocessed
 
 # preprocessed