From 0f543883cd0505a98fdc680ce2f08cbfca6d52a7 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 28 Jun 2018 19:28:02 -0400 Subject: toolchain: Replace YASM with NASM Packages libx264 and ffmpeg are built with ASM options on x86 platforms. The current libx264 version no longer builds with YASM and requires NASM. ffmpeg 3.x can be built with either YASM or NASM however, furture 4.x versions will require NASM. Signed-off-by: Ted Hess Acked-by: Rosen Penev --- toolchain/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/Makefile') diff --git a/toolchain/Makefile b/toolchain/Makefile index 409955c23a..9432990f4f 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -29,7 +29,7 @@ curdir:=toolchain # subdirectories to descend into -$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_YASM),yasm) +$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm) ifdef CONFIG_USE_UCLIBC $(curdir)/builddirs += $(LIBC)/utils endif -- cgit v1.2.3