aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/Config.in
diff options
context:
space:
mode:
authorTed Hess <thess@kitschensync.net>2018-06-28 19:28:02 -0400
committerTed Hess <thess@kitschensync.net>2018-07-05 10:17:06 -0400
commit0f543883cd0505a98fdc680ce2f08cbfca6d52a7 (patch)
treef4a6998faf88e47bee44aba46c1d72eb6c81d4ea /toolchain/Config.in
parent9009efa18b45b4b573111fafa777f7b642486e3e (diff)
downloadupstream-0f543883cd0505a98fdc680ce2f08cbfca6d52a7.tar.gz
upstream-0f543883cd0505a98fdc680ce2f08cbfca6d52a7.tar.bz2
upstream-0f543883cd0505a98fdc680ce2f08cbfca6d52a7.zip
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 <thess@kitschensync.net> Acked-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'toolchain/Config.in')
-rw-r--r--toolchain/Config.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 96acf1e5c4..47e1c787df 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -224,13 +224,13 @@ comment "Compiler"
source "toolchain/gcc/Config.in"
-config YASM
+config NASM
bool
depends on ( i386 || x86_64 )
- prompt "Build yasm" if TOOLCHAINOPTS
+ prompt "Build nasm" if TOOLCHAINOPTS
default y
help
- Enable if you want to build yasm
+ Enable if you want to build nasm
comment "C Library"
depends on TOOLCHAINOPTS